diff --git a/sp/src/game/server/hl2/npc_BaseZombie.cpp b/sp/src/game/server/hl2/npc_BaseZombie.cpp
index 4bd4b475..a120e6b4 100644
--- a/sp/src/game/server/hl2/npc_BaseZombie.cpp
+++ b/sp/src/game/server/hl2/npc_BaseZombie.cpp
@@ -2544,9 +2544,6 @@ void CNPC_BaseZombie::ReleaseHeadcrab( const Vector &vecOrigin, const Vector &ve
 #ifdef MAPBASE
 			// Inherit some misc. properties
 			pGib->m_iViewHideFlags = m_iViewHideFlags;
-
-			// Add response context for companion response (more reliable than checking for post-death zombie entity)
-			pCrab->AddContext( "from_zombie", "1", 2.0f );
 #endif
 
 			pGib->SetOwnerEntity( this );
@@ -2593,6 +2590,9 @@ void CNPC_BaseZombie::ReleaseHeadcrab( const Vector &vecOrigin, const Vector &ve
 		// Inherit some misc. properties
 		pCrab->m_bForceServerRagdoll = m_bForceServerRagdoll;
 		pCrab->m_iViewHideFlags = m_iViewHideFlags;
+
+		// Add response context for companion response (more reliable than checking for post-death zombie entity)
+		pCrab->AddContext( "from_zombie", "1", 2.0f );
 #endif
 		
 		// make me the crab's owner to avoid collision issues