diff --git a/src/game/server/eventhandler.cpp b/src/game/server/eventhandler.cpp
index bff14e5a8..acb95187a 100644
--- a/src/game/server/eventhandler.cpp
+++ b/src/game/server/eventhandler.cpp
@@ -81,11 +81,17 @@ void CEventHandler::EventToSixup(int *pType, int *pSize, const char **ppData)
 		pEvent7->m_X = pEvent->m_X;
 		pEvent7->m_Y = pEvent->m_Y;
 
+		pEvent7->m_ClientID = 0;
+		pEvent7->m_Angle = 0;
+
 		// This will need some work, perhaps an event wrapper for damageind,
 		// a scan of the event array to merge multiple damageinds
 		// or a separate array of "damage ind" events that's added in while snapping
 		pEvent7->m_HealthAmount = 1;
 
+		pEvent7->m_ArmorAmount = 0;
+		pEvent7->m_Self = 0;
+
 		*ppData = s_aEventStore;
 	}
 	else if(*pType == NETEVENTTYPE_SOUNDGLOBAL) // No more global sounds for the server