diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
index 60d3b4c25f..3a79fc0af4 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -298,6 +298,11 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
         if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled()) {
             user.setGodModeEnabled(false);
         }
+        final GameMode quitGameMode = user.getBase().getGameMode();
+        if (user.isFlyModeEnabled() && !user.getBase().getAllowFlight()
+            && (quitGameMode == GameMode.SURVIVAL || quitGameMode == GameMode.ADVENTURE)) {
+            user.setFlyModeEnabled(false);
+        }
         if (user.isVanished()) {
             user.setLeavingHidden(true);
             user.setVanished(false);