diff --git a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
index 030ede80..5d0ee81e 100644
--- a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
+++ b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
@@ -162,11 +162,25 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         for (int i = 0; i < inputDeviceContexts.size(); i++) {
             InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
 
+            if (deviceContext.mouseEmulationTimer != null) {
+                deviceContext.mouseEmulationTimer.cancel();
+                deviceContext.mouseEmulationTimer = null;
+            }
+
             if (deviceContext.vibrator != null) {
                 deviceContext.vibrator.cancel();
             }
         }
 
+        for (int i = 0; i < usbDeviceContexts.size(); i++) {
+            UsbDeviceContext deviceContext = usbDeviceContexts.valueAt(i);
+
+            if (deviceContext.mouseEmulationTimer != null) {
+                deviceContext.mouseEmulationTimer.cancel();
+                deviceContext.mouseEmulationTimer = null;
+            }
+        }
+
         deviceVibrator.cancel();
     }