diff --git a/web/app/assets/javascripts/configureTrack.js b/web/app/assets/javascripts/configureTrack.js
index ededb4025..1b7c5b1cb 100644
--- a/web/app/assets/javascripts/configureTrack.js
+++ b/web/app/assets/javascripts/configureTrack.js
@@ -657,17 +657,27 @@
             logger.debug("Calling TrackSetChatEnable with value = " + voiceChatType);
             context.jamClient.TrackSetChatEnable(voiceChatType == VOICE_CHAT.CHAT ? true : false);
 
-            // UNASSIGNED VOICE CHAT
-            $('#voice-inputs-unused > option').each(function() {
-                logger.debug("Marking " + this.value + " as unassigned voice input.");
-                context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.UNASSIGNED);
-            });
+            if (voiceChatType == VOICE_CHAT.CHAT) {
+                // UNASSIGNED VOICE CHAT
+                $('#voice-inputs-unused > option').each(function() {
+                    logger.debug("Marking " + this.value + " as unassigned voice input.");
+                    context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.UNASSIGNED);
+                });
 
-            // VOICE CHAT INPUT
-            $("#voice-inputs-selection > option").each(function() {
-                logger.debug("Saving chat input = " + this.value);
-                context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.CHAT);
-            });
+                // VOICE CHAT INPUT
+                $("#voice-inputs-selection > option").each(function() {
+                    logger.debug("Saving chat input = " + this.value);
+                    context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.CHAT);
+                });
+            }
+            // make sure any previously assigned chat devices are marked as unassigned
+            else if (voiceChatType == VOICE_CHAT.NO_CHAT) {
+                // chat devices that were assigned
+                $.each(chatOtherAssignedList, function(index, val) {
+                    logger.debug("Marking " + val.id + " as unassigned voice input.");
+                    context.jamClient.TrackSetAssignment(val.id, true, ASSIGNMENT.UNASSIGNED);
+                });
+            }
         }
 
         function cancelSettings() {