diff --git a/src/b_bot.c b/src/b_bot.c
index 709a280b5..895c8d18d 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -135,7 +135,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
 	// ********
 	// FLY MODE
 	// spinmode check
-	if (spinmode)
+	if (spinmode || player->exiting)
 		thinkfly = false;
 	else
 	{