diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 73a1d393..0c2aa004 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -36,10 +36,8 @@ public class SQLWrapperImpl implements SQLWrapper {
 
     @Override
     public void processSchematicType(GameModeConfig<String, String, String> gameModeConfig, SchematicType type) {
-        if (!gameModeConfig.CheckQuestions.isEmpty()) {
-            CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
-        }
         if (type.checkType() != null) {
+            CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
             CheckCommand.addFightType(type.checkType(), type);
         }
     }