diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/other/GamemodeCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/other/GamemodeCommand.java
index e210a9de..f4d38198 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/other/GamemodeCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/other/GamemodeCommand.java
@@ -40,6 +40,10 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void genericCommand(final Player p) {
+		if (NoClipCommand.getNOCLIPS().contains(p)) {
+			p.performCommand("noclip");
+			return;
+		}
 		if (p.getGameMode() == GameMode.CREATIVE) {
 			p.setGameMode(GameMode.SPECTATOR);
 		} else {