diff --git a/sc2/src/sc2code/planets/gensam.c b/sc2/src/sc2code/planets/gensam.c
index db481f6c7..b3e1a505d 100644
--- a/sc2/src/sc2code/planets/gensam.c
+++ b/sc2/src/sc2code/planets/gensam.c
@@ -148,6 +148,10 @@ GenerateSamatra (BYTE control)
 		case INIT_NPCS:
 			if (!GET_GAME_STATE (URQUAN_MESSED_UP))
 				BuildUrquanGuard ();
+			else
+			{	// Exorcise Ur-Quan ghosts upon system reentry
+				PutGroupInfo (0L, (BYTE)~0); // wipe out the group
+			}
 			break;
 		case REINIT_NPCS:
 			GetGroupInfo (0L, 0);