diff --git a/bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py b/bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py
index f92920d431..569be704b9 100644
--- a/bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py
+++ b/bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py
@@ -140,17 +140,6 @@ class EnergyPlusSimSettings(BuildingSimSettings):
         multiple_choice=True,
         for_frontend=True
     )
-    correct_space_boundaries = BooleanSetting(
-        default=True,
-        description='Apply geometric correction to space boundaries.',
-        for_frontend=True
-    )
-    close_space_boundary_gaps = BooleanSetting(
-        default=True,
-        description='Close gaps in the set of space boundaries by adding '
-                    'additional 2b space boundaries.',
-        for_frontend=True
-    )
     add_natural_ventilation = BooleanSetting(
         default=True,
         description='Add natural ventilation to the building. Natural '
diff --git a/bim2sim/plugins/PluginTEASER/bim2sim_teaser/sim_settings.py b/bim2sim/plugins/PluginTEASER/bim2sim_teaser/sim_settings.py
index b2d18cc9b3..7e337de4cc 100644
--- a/bim2sim/plugins/PluginTEASER/bim2sim_teaser/sim_settings.py
+++ b/bim2sim/plugins/PluginTEASER/bim2sim_teaser/sim_settings.py
@@ -104,4 +104,4 @@ class TEASERSimSettings(BuildingSimSettings):
                     'prepare_regression_tests.py script.',
         for_frontend=False,
         mandatory=False
-    )
\ No newline at end of file
+    )
diff --git a/bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py b/bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py
index fa32283c7d..d27aab1bff 100644
--- a/bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py
+++ b/bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py
@@ -138,6 +138,8 @@ def test_run_kitfzkhaus(self):
         project.sim_settings.zoning_criteria = (
             ZoningCriteria.combined_single_zone)
         project.sim_settings.ahu_tz_overwrite = False
+        project.sim_settings.close_space_boundary_gaps = False
+        project.sim_settings.correct_space_boundaries = False
         answers = ()
         handler = DebugDecisionHandler(answers)
         for decision, answer in handler.decision_answer_mapping(project.run()):
diff --git a/bim2sim/sim_settings.py b/bim2sim/sim_settings.py
index dd4bf3a946..41c0422537 100644
--- a/bim2sim/sim_settings.py
+++ b/bim2sim/sim_settings.py
@@ -600,23 +600,6 @@ def check_mandatory(self):
         for_frontend=True
     )
 
-    add_space_boundaries = BooleanSetting(
-        default=False,
-        description='Add space boundaries. Only required for building '
-                    'performance simulation and co-simulations.',
-        for_frontend=True
-    )
-    correct_space_boundaries = BooleanSetting(
-        default=False,
-        description='Apply geometric correction to space boundaries.',
-        for_frontend=True
-    )
-    close_space_boundary_gaps = BooleanSetting(
-        default=False,
-        description='Close gaps in the set of space boundaries by adding '
-                    'additional 2b space boundaries.',
-        for_frontend=True
-    )
     stories_to_load_guids = GuidListSetting(
         default=[],
         description='List of IFC GUIDs for the specific stories that should '
@@ -1103,7 +1086,7 @@ def __init__(self):
         for_frontend=True
     )
     correct_space_boundaries = BooleanSetting(
-        default=False,
+        default=True,
         description='Apply geometric correction to space boundaries.',
         for_frontend=True
     )
@@ -1125,7 +1108,7 @@ def __init__(self):
         for_frontend=True
     )
     close_space_boundary_gaps = BooleanSetting(
-        default=False,
+        default=True,
         description='Close gaps in the set of space boundaries by adding '
                     'additional 2b space boundaries.',
         for_frontend=True