diff --git a/FightSystem_Core/src/config.yml b/FightSystem_Core/src/config.yml
index 14a9fed..350f6df 100644
--- a/FightSystem_Core/src/config.yml
+++ b/FightSystem_Core/src/config.yml
@@ -72,6 +72,8 @@ Schematic:
   ReplaceObsidianBedrock: false # defaults to false if missing
   # If the replacement should happen with block updates
   ReplaceWithBlockupdates: false # defaults to false if missing
+  # If the schematic perparation arena mode is time limited
+  UnlimitedPrepare: false # defaults to false if missing
   # Maximal amount of blocks allowed in the schematic
   MaxBlocks: 0 # defaults to 0 (ignored) if missing
   # Maximal amount of items per dispenser
diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
index 423a9c3..2632f0b 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
@@ -88,6 +88,7 @@ public class Config {
     public static final boolean PasteAligned;
     public static final boolean ReplaceObsidianBedrock;
     public static final boolean ReplaceWithBlockupdates;
+    public static final boolean UnlimitedPrepare;
 
     //team parameter
     public static final String TeamRedName;
@@ -185,6 +186,7 @@ public class Config {
         PasteAligned = config.getBoolean("Schematic.PasteAligned", false);
         ReplaceObsidianBedrock = config.getBoolean("Schematic.ReplaceObsidianBedrock", false);
         ReplaceWithBlockupdates = config.getBoolean("Schematic.ReplaceWithBlockupdates", false);
+        UnlimitedPrepare = config.getBoolean("Schematic.UnlimitedPrepare", false);
 
         GameName = config.getString("GameName", "WarGear");
         TeamChatDetection = config.getString("TeamChatPrefix", "+");
diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java b/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
index 877dfe0..cb5f2db 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
@@ -29,6 +29,9 @@ public class PostSchemCountdown extends Countdown {
 
     public PostSchemCountdown() {
         super(Config.SetupDuration, new Message("POST_SCHEM_COUNTDOWN"), null, false);
+        if(Config.mode == ArenaMode.PREPARE && Config.UnlimitedPrepare)
+            return;
+
         new StateDependentCountdown(ArenaMode.SeriousFight, FightState.PostSchemSetup, this);
     }