diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp
index 4097a12b7..59e2e890b 100644
--- a/src/game/client/components/controls.cpp
+++ b/src/game/client/components/controls.cpp
@@ -77,7 +77,7 @@ void CControls::OnReset()
 void CControls::ResetInput(int Dummy)
 {
 	m_LastData[Dummy].m_Direction = 0;
-	//m_LastData.m_Hook = 0;
+	//m_LastData[Dummy].m_Hook = 0;
 	// simulate releasing the fire button
 	if((m_LastData[Dummy].m_Fire&1) != 0)
 		m_LastData[Dummy].m_Fire++;
diff --git a/src/game/client/components/controls.h b/src/game/client/components/controls.h
index 413091d93..8f98d9e96 100644
--- a/src/game/client/components/controls.h
+++ b/src/game/client/components/controls.h
@@ -44,6 +44,6 @@ public:
 
 	int SnapInput(int *pData);
 	void ClampMousePos();
-	void ResetInput(int dummy);
+	void ResetInput(int Dummy);
 };
 #endif
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index 5e1a4faf7..75a5357f6 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -392,6 +392,7 @@ void CGameClient::OnDummySwap()
 	if (g_Config.m_ClDummyResetOnSwitch)
 	{
 		m_pControls->ResetInput(!g_Config.m_ClDummy);
+		m_pControls->m_InputData[!g_Config.m_ClDummy].m_Hook = 0;
 	}
 	m_DummyInput = m_pControls->m_InputData[!g_Config.m_ClDummy];
 }