diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index e69ef89ef..eea10a0f3 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.3:
+- Fix race on exiting starbase (bug 230) -PracturedBlue
 - Cleanup shipyard door animation (bug 215) -PhracturedBlue
 - Misc .ani fixes; Fixes asteroid destruction crash (bugs 150, 155, 158)
   and somewhat fixes Mycon potrait (bug #183) -fOSSiL
diff --git a/sc2/src/sc2code/starbase.c b/sc2/src/sc2code/starbase.c
index 9751cbe3c..4bfb92302 100644
--- a/sc2/src/sc2code/starbase.c
+++ b/sc2/src/sc2code/starbase.c
@@ -339,15 +339,13 @@ s.origin.x = SAFE_X, s.origin.y = SAFE_Y + 4;
 			|| GET_GAME_STATE (CHMMR_BOMB_STATE) == 2)
 	{
 ExitStarBase:
-		SetSemaphore (GraphicsSem);
 		if (pMS->flash_task)
 		{
-			Task_SetState (pMS->flash_task, TASK_EXIT);
+			ConcludeTask (pMS->flash_task);
 			pMS->flash_task = 0;
 		}
 		DestroyDrawable (ReleaseDrawable (pMS->CurFrame));
 		pMS->CurFrame = 0;
-		ClearSemaphore (GraphicsSem);
 		StopMusic ();
 		if (pMS->hMusic)
 		{