diff --git a/src/p_user.c b/src/p_user.c
index 03e1e4e23605efd0a04d7d430765fc5b6443b5b8..3710e87f152ff46830815d3c9d02d1921816b55f 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8818,6 +8818,9 @@ void P_PlayerThink(player_t *player)
 	if (player->exiting && countdown2)
 		player->exiting = 5;
 
+	// The following code is disabled for now as this causes the game to freeze sometimes
+	// Monster Iestyn -- 16/08/19
+#if 0
 	// Same check as below, just at 1 second before
 	// so we can fade music
 	if (!exitfadestarted &&
@@ -8855,6 +8858,7 @@ void P_PlayerThink(player_t *player)
 			S_FadeOutStopMusic(1*MUSICRATE);
 		}
 	}
+#endif
 
 	if (player->exiting == 2 || countdown2 == 2)
 	{