diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index aedd3b77e..0c133d3fa 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -987,8 +987,11 @@ void cPlayer::SetGameMode(eGameMode a_GameMode)
 	m_GameMode = a_GameMode;
 	m_ClientHandle->SendGameMode(a_GameMode);
 
-	SetFlying(false);
-	SetCanFly(false);
+	if (a_GameMode != gmCreative)
+	{
+		SetFlying(false);
+		SetCanFly(false);
+	}
 }