diff --git a/src/android/app/src/main/jni/button_manager.cpp b/src/android/app/src/main/jni/button_manager.cpp
index fcacc9d88..6b24c7a3c 100644
--- a/src/android/app/src/main/jni/button_manager.cpp
+++ b/src/android/app/src/main/jni/button_manager.cpp
@@ -311,6 +311,7 @@ void Init() {
 
 void Shutdown() {
     Input::UnregisterFactory<Input::ButtonDevice>("gamepad");
+    Input::UnregisterFactory<Input::AnalogDevice>("gamepad");
     button.reset();
     analog.reset();
 }
diff --git a/src/android/app/src/main/jni/button_manager.h b/src/android/app/src/main/jni/button_manager.h
index 6c6e4236c..9bd673903 100644
--- a/src/android/app/src/main/jni/button_manager.h
+++ b/src/android/app/src/main/jni/button_manager.h
@@ -132,4 +132,4 @@ std::string GenerateButtonParamPackage(int type);
 std::string GenerateAnalogButtonParamPackage(int axis, float axis_val);
 
 std::string GenerateAnalogParamPackage(int type);
-} // namespace InputManager
\ No newline at end of file
+} // namespace InputManager