diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba30f7f1..d36c64a0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="394"
+    android:versionCode="395"
     android:versionName="1.5.24">
 
     <uses-feature android:name="android.hardware.type.pc" android:required="false" />
diff --git a/app/src/main/java/space/celestia/mobilecelestia/celestia/CelestiaInteraction.kt b/app/src/main/java/space/celestia/mobilecelestia/celestia/CelestiaInteraction.kt
index 05d633d4..308f54f7 100644
--- a/app/src/main/java/space/celestia/mobilecelestia/celestia/CelestiaInteraction.kt
+++ b/app/src/main/java/space/celestia/mobilecelestia/celestia/CelestiaInteraction.kt
@@ -268,6 +268,7 @@ class CelestiaInteraction(context: Context, private val appCore: AppCore, privat
         if (!isReady) { return true }
 
         if (event.source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK
+            && event.device != null
             && event.actionMasked == MotionEvent.ACTION_MOVE) {
             if (!canAcceptKeyEvents()) return false
             // Process the movements starting from the