diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
index a75cbff63..a2f127a71 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
@@ -166,6 +166,9 @@ public class FlagCmd extends SubCommand {
                         return false;
                     }
                 }
+                if(flag == Flags.TIME) {
+                    player.setTime(Long.MAX_VALUE);
+                }
                 MainUtil.sendMessage(player, C.FLAG_REMOVED);
                 return true;
             }
diff --git a/Core/src/main/java/com/plotsquared/listener/PlotListener.java b/Core/src/main/java/com/plotsquared/listener/PlotListener.java
index 5889d8a8d..25197fc5f 100644
--- a/Core/src/main/java/com/plotsquared/listener/PlotListener.java
+++ b/Core/src/main/java/com/plotsquared/listener/PlotListener.java
@@ -209,7 +209,7 @@ public class PlotListener {
                     PlotGameMode gameMode = player.getGameMode();
                     if (gameMode == PlotGameMode.SURVIVAL || gameMode == PlotGameMode.ADVENTURE) {
                         player.setFlight(false);
-                    } else if (player.getFlight() != true) {
+                    } else if (!player.getFlight()) {
                         player.setFlight(true);
                     }
                 }