diff --git a/app/assets/javascripts/addTrack.js b/app/assets/javascripts/addTrack.js
index a515649ca..03b4405df 100644
--- a/app/assets/javascripts/addTrack.js
+++ b/app/assets/javascripts/addTrack.js
@@ -165,7 +165,7 @@
         function validateSettings() {
             var isValid = true;
             var noTrackErrMsg = 'You must assign at least one input port to each of your tracks. Please update your settings to correct this. If you want to delete a track, please return to the session screen and delete the track by clicking the "x" box in the upper right-hand corner of the track.';
-            var noInstrumentErrMsg = 'You must specify what instrument is being played for each track. Please update your settings to correct this.';
+            var noInstrumentErrMsg = 'You must specify what instrument is being played for this new track. Please update your settings to correct this.';
 
             var errMsg;
 
diff --git a/app/assets/javascripts/configureTrack.js b/app/assets/javascripts/configureTrack.js
index 96d1c5867..34848f9fd 100644
--- a/app/assets/javascripts/configureTrack.js
+++ b/app/assets/javascripts/configureTrack.js
@@ -224,11 +224,6 @@
             $('#btn-error-ok').click(context.JK.showOverlay);
             $('#btn-save-settings').click(saveSettings);
             $('#btn-cancel-settings').click(cancelSettings);
-
-            // $('#btn-leave-session-test').click(function() {
-            //     hideOverlay();
-            //     $('div[layout-id="configure-audio"]').hide();
-            // });
         }
 
         function restoreVoiceChatOptions(deviceId) {
@@ -331,8 +326,6 @@
             $('#tab-configure-voice').removeClass('selected');
 
             if (refreshLists) {
-                configureDriverSettingsButton();
-
                 $('#audio-drivers').empty();
 
                 // determine correct music device to preselect
@@ -358,6 +351,12 @@
                     $('#audio-drivers').append(html);
                 }
 
+                if (deviceId === '') {
+                    context.jamClient.TrackSetMusicDevice($('#audio-drivers').val());
+                }
+
+                // configureDriverSettingsButton();
+
                 $('#audio-inputs-unused').empty();
                 $('#track1-input').empty();
                 $('#track1-instrument').empty();