diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 15ddc317d..39d33f24d 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -474,6 +474,10 @@ void CClient::SendInput()
 		if(!g_Config.m_ClDummyHammer)
 		{
 			m_Fire = 25;
+
+			if(!Size && (!DummyInput.m_Direction && !DummyInput.m_Jump && !DummyInput.m_Hook))
+				return;
+
 			// pack input
 			CMsgPacker Msg(NETMSG_INPUT);
 			Msg.AddInt(m_AckGameTick[g_Config.m_ClDummy]);
diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp
index d72d0e1b6..66a1e0641 100644
--- a/src/game/client/components/controls.cpp
+++ b/src/game/client/components/controls.cpp
@@ -200,6 +200,10 @@ int CControls::SnapInput(int *pData)
 		// send at at least 10hz
 		if(time_get() > LastSendTime + time_freq()/25)
 			Send = true;
+
+		if(m_pClient->m_Snap.m_pLocalCharacter && m_pClient->m_Snap.m_pLocalCharacter->m_Weapon == WEAPON_NINJA
+			&& (m_InputData.m_Direction || m_InputData.m_Jump || m_InputData.m_Hook))
+			Send = true;
 	}
 
 	// copy and return size