diff --git a/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java b/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java
index bccc97ad..6447be84 100644
--- a/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java
+++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java
@@ -190,8 +190,14 @@ public class DigitalButton extends VirtualControllerElement {
         for (DigitalButtonListener listener : listeners) {
             listener.onRelease();
         }
-        timerLongClick.cancel();
-        longClickTimerTask.cancel();
+
+        // We may be called for a release without a prior click
+        if (timerLongClick != null) {
+            timerLongClick.cancel();
+        }
+        if (longClickTimerTask != null) {
+            longClickTimerTask.cancel();
+        }
     }
 
     @Override