diff --git a/limelight-pc/src/com/limelight/input/GamepadHandler.java b/limelight-pc/src/com/limelight/input/GamepadHandler.java
index fa6ff50..4fde2dc 100644
--- a/limelight-pc/src/com/limelight/input/GamepadHandler.java
+++ b/limelight-pc/src/com/limelight/input/GamepadHandler.java
@@ -44,7 +44,6 @@ public class GamepadHandler {
 				while (true) {
 					for (Gamepad gamepad : gamepads) {
 						if (!gamepad.poll()) {
-							gamepads.remove(gamepad);
 							break;
 						}
 						gamepad.handleEvents();