diff --git a/sp/src/game/server/hl2/npc_citizen17.cpp b/sp/src/game/server/hl2/npc_citizen17.cpp
index 42822d2f..be80179a 100644
--- a/sp/src/game/server/hl2/npc_citizen17.cpp
+++ b/sp/src/game/server/hl2/npc_citizen17.cpp
@@ -1800,10 +1800,16 @@ void CNPC_Citizen::StartTask( const Task_t *pTask )
 				break;
 			}
 
+#ifdef MAPBASE
+			SetSpeechTarget( GetTarget() );
+#endif
 			Speak( TLK_HEAL );
 		}
 		else if ( IsAmmoResupplier() )
 		{
+#ifdef MAPBASE
+			SetSpeechTarget( GetTarget() );
+#endif
 			Speak( TLK_GIVEAMMO );
 		}
 		SetIdealActivity( (Activity)ACT_CIT_HEAL );