diff --git a/src/InputManager.cpp b/src/InputManager.cpp
index ae81962f1..5df74a951 100644
--- a/src/InputManager.cpp
+++ b/src/InputManager.cpp
@@ -165,14 +165,14 @@ void InputManager::init()
 	SDL_JoystickEventState(SDL_ENABLE);
 
 	//start timer for input device polling
-	//devicePollingTimer = SDL_AddTimer(POLLING_INTERVAL, devicePollingCallback, (void *)this);
+	devicePollingTimer = SDL_AddTimer(POLLING_INTERVAL, devicePollingCallback, (void *)this);
 
 	loadConfig();
 }
 
 void InputManager::deinit()
 {
-	//SDL_RemoveTimer(devicePollingTimer);
+	SDL_RemoveTimer(devicePollingTimer);
 
 	SDL_JoystickEventState(SDL_DISABLE);