diff --git a/src/js/fc.js b/src/js/fc.js
index 86c2360a36..a4c854bdcb 100644
--- a/src/js/fc.js
+++ b/src/js/fc.js
@@ -226,9 +226,9 @@ const FC = {
     resetState () {
         // Using `Object.assign` instead of reassigning to
         // trigger the updates on the Vue side
-        Object.assign(this.CONFIG, INITIAL_CONFIG);
-        Object.assign(this.ANALOG, INITIAL_ANALOG);
-        Object.assign(this.BATTERY_CONFIG, INITIAL_BATTERY_CONFIG);
+        this.CONFIG = JSON.parse(JSON.stringify(INITIAL_CONFIG));
+        this.ANALOG = JSON.parse(JSON.stringify(INITIAL_ANALOG));
+        this.BATTERY_CONFIG = JSON.parse(JSON.stringify(INITIAL_BATTERY_CONFIG));
 
         this.BF_CONFIG = {
             currentscale:               0,
diff --git a/src/js/port_handler.js b/src/js/port_handler.js
index 40998156ef..3394ba2d01 100644
--- a/src/js/port_handler.js
+++ b/src/js/port_handler.js
@@ -158,14 +158,15 @@ PortHandler.check_usb_devices = function (callback) {
             dfuElement.remove();
             self.setPortsInputWidth();
             self.dfu_available = false;
-        }
-        if ($('option:selected', self.portPickerElement).val() !== 'DFU') {
-            if (!(GUI.connected_to || GUI.connect_lock)) {
-                FC.resetState();
-            }
 
-            if (self.dfu_available) {
-                self.portPickerElement.trigger('change');
+            if ($('option:selected', self.portPickerElement).val() !== 'DFU') {
+                if (!(GUI.connected_to || GUI.connect_lock)) {
+                    FC.resetState();
+                }
+
+                if (self.dfu_available) {
+                    self.portPickerElement.trigger('change');
+                }
             }
         }