pfSense » pfSense Plus

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 9f04453019..7ac56a43a1 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -1501,7 +1501,19 @@ function interface_vxlan_configure(&$vxlan, $vxlankey = "", $flush = true) {
         get_interface_arr(true);
     }

-    interfaces_bring_up($vxlanif);
+    $parent_bridge = false;
+    foreach (config_get_path('interfaces', []) as $id => $interface_config) {
+        if ($interface_config['if'] != $vxlanif) {
+            continue;
+        }
+        $parent_bridge = link_interface_to_bridge($id);
+        break;
+    }
+    if ($parent_bridge) {
+        interface_bridge_add_member($parent_bridge, $vxlanif);
+    } else {
+        interfaces_bring_up($vxlanif);
+    }

     return $vxlanif;
 }

# Saving and applying WG
interface_bridge_add_member('bridge0', 'vxlan0') at /etc/inc/interfaces.inc:1513
interface_vxlan_configure(array(10), 0)
array_walk(array(1), 'interface_vxlan_configure') at /etc/inc/interfaces.inc:4681
interface_configure('opt2', true) at /usr/local/www/interfaces.php:477

# Saving and applying VXLAN
interface_bridge_add_member('bridge0', 'vxlan0') at /etc/inc/interfaces.inc:4662
interface_configure('opt3', true) at /usr/local/www/interfaces.php:477