diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
index d3bc6cca5..d759166c5 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
@@ -31,13 +31,20 @@
         <style>tokenize</style>
         <type>select_multiple</type>
         <allownew>true</allownew>
-        <help>Select the network to advertise, you have to set a Null route via System -> Routes</help>
+        <help>Defines which networks, which are connected to this router, will be advertised over BGP. To announce all defined networks, Network Import-Check can be disabled in advanced settings if required.</help>
+    </field>
+    <field>
+        <id>bgp.networkimportcheck</id>
+        <label>Network Import-Check</label>
+        <type>checkbox</type>
+        <advanced>true</advanced>
+        <help>When enabled (default), BGP only announces networks set at 'Network' if they are present in the routers routing table (alternatively, you can also set a null-route via System -> Routes). If disabled, all configured networks will be announced.</help>
     </field>
     <field>
         <id>bgp.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
-        <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
+        <help>Select other routing sources, which should be redistributed to the other nodes.</help>
         <hint>Type or select a route source.</hint>
     </field>
 </form>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
index a061277bd..dd4697d3e 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/quagga/bgp</mount>
     <description>BGP Routing configuration</description>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -21,6 +21,10 @@
             <default>0</default>
             <Required>Y</Required>
         </graceful>
+        <networkimportcheck type="BooleanField">
+            <default>1</default>
+            <Required>Y</Required>
+        </networkimportcheck>
         <networks type="CSVListField">
             <default></default>
             <Required>N</Required>
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
index c2066e0f9..5c0f7e773 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -45,6 +45,11 @@ frr defaults {{ OPNsense.quagga.general.profile }}
 router bgp {{ OPNsense.quagga.bgp.asnumber }}
  no bgp default ipv4-unicast
  no bgp ebgp-requires-policy
+{%   if helpers.exists('OPNsense.quagga.bgp.networkimportcheck') and OPNsense.quagga.bgp.networkimportcheck == '1' %}
+ bgp network import-check
+{%   else %}
+ no bgp network import-check
+{%   endif %}
 {%   if helpers.exists('OPNsense.quagga.bgp.graceful') and OPNsense.quagga.bgp.graceful == '1' %}
  bgp graceful-restart
 {%   endif %}