diff --git a/src/teavm/java/net/PeytonPlayz585/shadow/input/Controller.java b/src/teavm/java/net/PeytonPlayz585/shadow/input/Controller.java
index 9dbbe31..5f48f29 100644
--- a/src/teavm/java/net/PeytonPlayz585/shadow/input/Controller.java
+++ b/src/teavm/java/net/PeytonPlayz585/shadow/input/Controller.java
@@ -256,6 +256,7 @@ public class Controller {
 				int index = arg0.getGamepad().getIndex();
 				if(connectedControllers.contains(index)) {
 					connectedControllers.remove(index);
+					resetButtonStates();
 					System.out.println("Controller disconnected!");
 				}
 			}