diff --git a/src/p_mobj.c b/src/p_mobj.c
index 62dee0a6..000022b1 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6931,6 +6931,7 @@ void P_MobjThinker(mobj_t *mobj)
 					{
 						mobj->flags &= ~MF_NOGRAVITY;
 						P_SetMobjState(mobj, S_NIGHTSDRONE1);
+						mobj->flags2 |= MF2_DONTDRAW;
 					}
 				}
 				else if (mobj->tracer && mobj->tracer->player)
diff --git a/src/st_stuff.c b/src/st_stuff.c
index aac6b09d..5b208d33 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -974,8 +974,8 @@ static void ST_drawNiGHTSHUD(void)
 	if (cv_debug & DBG_NIGHTSBASIC)
 		minlink = 0;
 
-	// Cheap hack: don't display when the score is showing
-	if (stplyr->texttimer && stplyr->textvar == 4)
+	// Cheap hack: don't display when the score is showing or you're exiting a map
+	if ((stplyr->exiting) || (stplyr->texttimer && stplyr->textvar == 4))
 		minlink = INT32_MAX;
 
 	if (G_IsSpecialStage(gamemap))