diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c
index 7dbe94c11..56f73bdac 100644
--- a/sc2/src/sc2code/comm.c
+++ b/sc2/src/sc2code/comm.c
@@ -1404,6 +1404,9 @@ HailAlien (void)
 	SetContextFont (OldFont);
 	DestroyFont (PlayerFont);
 
+	// Some support code tests either of these to see if the
+	// game is currently in comm or encounter
+	CommData.ConversationPhrasesRes = 0;
 	CommData.ConversationPhrases = 0;
 	pCurInputState = 0;
 }
diff --git a/sc2/src/sc2code/gameopt.c b/sc2/src/sc2code/gameopt.c
index fb4338a42..00fc3ef4d 100644
--- a/sc2/src/sc2code/gameopt.c
+++ b/sc2/src/sc2code/gameopt.c
@@ -1242,7 +1242,8 @@ PickGame (MENU_STATE *pMS)
 
 	if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
 	{
-		if (CommData.ConversationPhrases
+		// TODO: Need a better test for in-encounter
+		if (CommData.ConversationPhrasesRes
 				|| !(pSolarSysState
 				&& pSolarSysState->MenuState.Initialized < 3))
 		{
@@ -1266,7 +1267,9 @@ PickGame (MENU_STATE *pMS)
 			IP_frame ();
 
 
-			if (CommData.ConversationPhrases == 0 && !PLRPlaying ((MUSIC_REF)~0))
+			// TODO: Need a better test for in-encounter
+			if (!CommData.ConversationPhrasesRes
+					&& !PLRPlaying ((MUSIC_REF)~0))
 			{
 				if (pSolarSysState->MenuState.Initialized < 3)
 				{