diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 845dc273d5..f1f25e87d5 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -438,7 +438,9 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
     init_manila
     echo_summary "Installing extra libraries"
     install_libraries
-    iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_local_resolv False
+    if is_service_enabled neutron; then
+        iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_local_resolv False
+    fi
 elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
     echo_summary "Creating Manila entities for auth service"
     create_manila_accounts