diff --git a/Layout/default/AddressDB/Form.php b/Layout/default/AddressDB/Form.php
index bce29864a..ce2285035 100644
--- a/Layout/default/AddressDB/Form.php
+++ b/Layout/default/AddressDB/Form.php
@@ -149,7 +149,6 @@
                         <label class="col-lg-2 col-form-label" for="tool_building_type">Gebäudetyp</label>
                         <div class="col-lg-10">
                             <select name="tool_building_type" id="tool_building_type" class="form-control">
-                                <option value="">Alle</option>
                                 <option value="0" <?=($address->tool_building_type == "0") ? "selected='selected'" : ""?>>Unbekannt</option>
                                 <option value="1" <?=($address->tool_building_type == "1") ? "selected='selected'" : ""?>>EFH</option>
                                 <option value="2" <?=($address->tool_building_type == "2") ? "selected='selected'" : ""?>>MFH</option>
diff --git a/db/migrations/20250527123000_adb_hausnummer_add_tool_type.php b/db/migrations/20250527123000_adb_hausnummer_add_tool_type.php
index e418d7856..f2d766208 100644
--- a/db/migrations/20250527123000_adb_hausnummer_add_tool_type.php
+++ b/db/migrations/20250527123000_adb_hausnummer_add_tool_type.php
@@ -9,8 +9,8 @@ final class AdbHausnummerAddToolType extends AbstractMigration
     {
         if($this->getEnvironment() == "addressdb") {
             $Hausnummer = $this->table("Hausnummer");
-            $Hausnummer->addColumn("tool_building_type", "integer", ["default" => 0, "null" => false])
-                ->addColumn("tool_building_type_override", "boolean", ["default" => 0, "null" => false]);
+            $Hausnummer->addColumn("tool_building_type", "integer", ["default" => 0, "null" => true])
+                ->addColumn("tool_building_type_override", "boolean", ["default" => 0, "null" => true]);
 
             $Hausnummer->update();
         }