diff --git a/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee b/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee
index 8fcad437e..38bcb2d5a 100644
--- a/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee
@@ -286,20 +286,20 @@ ConfigureTracksStore = @ConfigureTracksStore
 
     @setState({midiInterface: null})
 
-  # instrumentSelected: (e) ->
-  #   $root = $(@getDOMNode())
-  #   $select = $root.find('.instrument-pick')
+  instrumentSelected: (e) ->
+    $root = $(@getDOMNode())
+    $select = $root.find('.instrument-pick')
 
-  #   instrumentId = $select.val()
-  #   ConfigureTracksActions.associateInstrumentWithTrack(instrumentId)
+    instrumentId = $select.val()
+    ConfigureTracksActions.associateInstrumentWithTrack(instrumentId)
 
-  instrumentSelected: `function(e) {
-        const $root = $(this.getDOMNode());
-        const $select = $root.find('.instrument-pick');
+  # instrumentSelected: `function(e) {
+  #       const $root = $(this.getDOMNode());
+  #       const $select = $root.find('.instrument-pick');
 
-        const instrumentId = $select.val();
-        ConfigureTracksActions.associateInstrumentWithTrack.trigger(instrumentId);
-    }`
+  #       const instrumentId = $select.val();
+  #       ConfigureTracksActions.associateInstrumentWithTrack.trigger(instrumentId);
+  #   }`
 
 
   doClose: (e) ->
@@ -380,7 +380,7 @@ ConfigureTracksStore = @ConfigureTracksStore
         $root.find('select.input-selectors').unbind('change').change(this.inputChanged);
         $root.find('select.instrument-pick').unbind('change').change(this.instrumentSelected);
         $root.find('select.vsts').unbind('change').change(this.vstsChanged);
-        $root.find('select.midi-select').unbind('change').change(this.updateMidiAssociations);
+        $root.find('select.midi-select').unbind('change').change(this.midiInterfaceChanged);
       }
     }`
 
@@ -438,10 +438,10 @@ ConfigureTracksStore = @ConfigureTracksStore
     vstSelected = $select.val()
 
     logger.debug("updateMidiAssocations", vstSelected, midiInterface)
-    #if vstSelected != 'NONE'
-    vstSelected = {file: vstSelected}
-    #else
-    #  vstSelected = null
+    if vstSelected != 'NONE'
+      vstSelected = {file: vstSelected}
+    else
+      vstSelected = null
 
     if midiInterface == ''
       midiInterface = null
diff --git a/web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee b/web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee
index 770efd22f..14798deb4 100644
--- a/web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee
+++ b/web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee
@@ -351,7 +351,6 @@ void removeSearchPath(int typeId, QString pathToRemove);
 
     findMidiTrack: () ->
       midi = null
-      console.log("__DEBUG__ @trackAssignments", @trackAssignments)
       for assignment in @trackAssignments.inputs.assigned
         if assignment.assignment == MIDI_TRACK
           midi = assignment
@@ -601,7 +600,6 @@ void removeSearchPath(int typeId, QString pathToRemove);
     #     context.JK.Banner.showAlert('Unable to save assignments. ' + result);
 
     onAssociateInputsWithTrack: `async function(inputId1, inputId2) {
-        alert('onAssociateInputsWithTrack')
         if (this.trackNumber == null) { return; }
 
         for (let inputs of Array.from(this.editingTrack)) {
@@ -661,7 +659,7 @@ void removeSearchPath(int typeId, QString pathToRemove);
     #   else
     #     context.JK.Banner.showAlert('Unable to save assignments. ' + result);
 
-    onAssociateInstrumentWithTrack: `function(instrumentId) {
+    onAssociateInstrumentWithTrack: `async function(instrumentId) {
       if (this.trackNumber == null) { return; }
 
       let clientInstrumentId = null;
@@ -671,36 +669,30 @@ void removeSearchPath(int typeId, QString pathToRemove);
         clientInstrumentId = 0;
       }
 
-      const self = this
-      context.jamClient.TrackSetInstrument(self.trackNumber, clientInstrumentId).then(function(result){
+      logger.debug("context.jamClient.TrackSetInstrument(trackNumber, track.instrument_id)", this.trackNumber, instrumentId);
+      
+      const result1 = await context.jamClient.TrackSetInstrument(this.trackNumber, clientInstrumentId);
+      if(result1 && result1.process_status === "Success"){
+      }else{
+        context.JK.Banner.showAlert('Unable to save assignments. ' + result1);
+      }
         
-        console.log("__DEBUG__ TrackSetInstrument result, trackNumber, MIDI_TRACK", result, self.trackNumber, MIDI_TRACK);
-        
-        if (self.trackNumber == MIDI_TRACK) {
-          console.log("checking midi track for track instrument synchronization");
-          // keep artificial midi track in sync
-          const midi = self.findMidiTrack();
-          console.log("__DEBUG__ midi", midi) 
-          if (midi != null) {
-            logger.debug('synced midi track with ' + instrumentId);
-            midi.instrument_id = instrumentId;
-            context.jamClient.TrackSaveAssignments().then(function(result){
-              if(result.process_status !== 'Success') {
-                console.log("__DEBUG__ Unable to save1", result) 
-                context.JK.Banner.showAlert('Unable to save assignments.' + result);
-              }
-            }).catch(function(){
-              context.JK.Banner.showAlert('Unable to save assignments.');
-            })
-          }
+      if (this.trackNumber == MIDI_TRACK) {
+        console.log("checking midi track for track instrument synchronization");
+        // keep artificial midi track in sync
+        const midi = this.findMidiTrack();
+        if (midi != null) {
+          logger.debug('synced midi track with ' + instrumentId);
+          midi.instrument_id = instrumentId;
         }
+      }
 
-        if(result.process_status !== 'Success') {
-          context.JK.Banner.showAlert('Unable to save assignments. ' + result);
-        }
-      }).catch(function(){
-        context.JK.Banner.showAlert('Unable to save assignments.');
-      })
+      const result2 = await context.jamClient.TrackSaveAssignments();
+
+      if(!result2 || result2.length == 0) {
+      }else{
+        context.JK.Banner.showAlert('Unable to save assignments.' + result2);
+      }
       
     }`
 
@@ -733,7 +725,6 @@ void removeSearchPath(int typeId, QString pathToRemove);
     #   )), 250)
 
     onAssociateVSTWithTrack: `async function(vst) {
-        alert('onAssociateVSTWithTrack')
         if (!this.hasVst) {
           logger.debug("onAssociateVSTWithTrack skipped due to no VST");
           return;
@@ -998,7 +989,6 @@ void removeSearchPath(int typeId, QString pathToRemove);
     #   )), 250)
 
     onAssociateMIDIWithTrack: `async function(midiInterface) {
-        alert('onAssociateMIDIWithTrack')
         this.trackNumber = MIDI_TRACK;
 
         if ((midiInterface == null) || (midiInterface === '')) {