diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java
index 75fd8e72..5ae234d5 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java
@@ -87,8 +87,7 @@ public class NoClipCommand extends SWCommand implements Listener {
 
         BiFunction<Player, Object, Object> second = (player, o) -> {
             if (NOCLIPS.contains(player)) {
-                if (LAST_TICKS.getOrDefault(player, -1L).equals(TPSUtils.currentTick.get())) return o;
-                VersionedRunnable.call(new VersionedRunnable(() -> NoClipCommand_15.setGameModeInternal(player, GameMode.SPECTATOR), 15));
+                VersionedRunnable.call(new VersionedRunnable(() -> NoClipCommand_15.setGameModeInternal(player, GameMode.CREATIVE), 15));
                 LAST_TICKS.put(player, TPSUtils.currentTick.get());
             }
             return o;