diff --git a/js/gui.js b/js/gui.js
index 51df147366..52b927c44a 100644
--- a/js/gui.js
+++ b/js/gui.js
@@ -227,8 +227,7 @@ GUI_control.prototype.tab_switch_cleanup = function(callback) {
             if (callback) callback();
             break;
         case 'motor_outputs':
-            GUI.interval_remove('motor_pull');
-            GUI.interval_remove('status_pull');
+            GUI.interval_kill_all();
 
             if (callback) callback();
             break;
@@ -265,6 +264,11 @@ GUI_control.prototype.tab_switch_cleanup = function(callback) {
                 }, 5000); // if we dont allow enough time to reboot, CRC of "first" command sent will fail, keep an eye for this one
             });
             break;
+        case 'logging':
+            GUI.interval_kill_all();
+
+            if (callback) callback();
+            break;
         case 'firmware_flasher':
             // this.interval_remove('factory_mode');
             PortHandler.flush_callbacks();