diff --git a/src/input/device_manager.cpp b/src/input/device_manager.cpp
index 4ea2b0059..069121c3b 100644
--- a/src/input/device_manager.cpp
+++ b/src/input/device_manager.cpp
@@ -425,7 +425,7 @@ void DeviceManager::updateMultitouchDevice()
         if (m_multitouch_device->getPlayer() != m_single_player)
             m_multitouch_device->setPlayer(m_single_player);
     }
-    else if (m_assign_mode == NO_ASSIGN) // Don't set the player in NO_ASSIGN mode
+    else
     {
         m_multitouch_device->setPlayer(NULL);
     }
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index 9057b888e..1b6b21056 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -1185,6 +1185,8 @@ EventPropagation InputManager::input(const SEvent& event)
 
         if (device && device->isAccelerometerActive())
         {
+            m_device_manager->updateMultitouchDevice();
+
             for (unsigned int i = 0; i < device->getButtonsCount(); i++)
             {
                 MultitouchButton* button = device->getButton(i);