diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index ae630567c..17148536c 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -146,6 +146,15 @@
                       </select>
                   </div>
 
+                    <div class="col-sm-12 col-md-2">
+                        <label class="form-label" for="filter_borderpoint">Übergabepunkt</label>
+                        <select name="filter[borderpoint]" id="filter_borderpoint" class="form-control">
+                            <option value="all" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "all") ? "selected='selected'" : ""?>>Alle</option>
+                            <option value="1" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "1") ? "selected='selected'" : ""?>>Mit</option>
+                            <option value="0" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "0") ? "selected='selected'" : ""?>>Ohne</option>
+                        </select>
+                    </div>
+
                   <div class="col-sm-12 col-md-2">
                       <label class="form-label" for="partner_id">Partner</label>
                       <select name="filter[partner_id][]" id="filter_partner_id" class="form-control" multiple="multiple">
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 6637745aa..be12fe897 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -231,6 +231,12 @@ class PreorderController extends mfBaseController {
             $new_filter['addon_services'] = true;
         }
 
+        if(array_key_exists("borderpoint", $filter) && $filter['borderpoint'] == 1) {
+            $new_filter['add-where'] .= " AND (adb_hausnummer.borderpoint_lat IS NOT NULL AND adb_hausnummer.borderpoint_long IS NOT NULL)";
+        } elseif(array_key_exists("borderpoint", $filter) && $filter['borderpoint'] == 0) {
+            $new_filter['add-where'] .= " AND (adb_hausnummer.borderpoint_lat IS NULL OR adb_hausnummer.borderpoint_long IS NULL)";
+        }
+
         if(array_key_exists("address_source", $filter)) {
             if($filter['address_source'] == "manual") {
                 $new_filter['address_created'] = true;
@@ -293,10 +299,6 @@ class PreorderController extends mfBaseController {
             }
         }
 
-        /*if(array_key_exists("attributes", $filter) && count($filter['attributes'])) {
-
-        }*/
-
         if(is_array($filter) && count($filter)) {
             foreach($filter as $name => $value) {
                 $new_filter[$name] = $value;