diff --git a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb
index 1f4ff21116..d1387948e0 100644
--- a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb
+++ b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb
@@ -59,7 +59,7 @@ class OpenvSwitchVLAN < VNMMAD::VNMDriver
             arp_cache_poisoning if CONF[:arp_cache_poisoning] && @nic[:ip]
 
             # Prevent Mac-spoofing
-            mac_spoofing
+            mac_spoofing if nic[:filter_mac_spoofing] =~ /yes/i
 
             # Apply Firewall
             configure_fw if FIREWALL_PARAMS & @nic.keys != []