diff --git a/devstack/lib/watcher b/devstack/lib/watcher
index d247f5ca6..9d1cfe8ae 100644
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -47,9 +47,6 @@ WATCHER_POLICY_YAML=$WATCHER_CONF_DIR/policy.yaml.sample
 WATCHER_DEVSTACK_DIR=$WATCHER_DIR/devstack
 WATCHER_DEVSTACK_FILES_DIR=$WATCHER_DEVSTACK_DIR/files
 
-NOVA_CONF_DIR=/etc/nova
-NOVA_CONF=$NOVA_CONF_DIR/nova.conf
-
 if is_ssl_enabled_service "watcher" || is_service_enabled tls-proxy; then
     WATCHER_SERVICE_PROTOCOL="https"
 fi
@@ -193,9 +190,6 @@ function create_watcher_conf {
 
     iniset $WATCHER_CONF oslo_messaging_notifications driver "messagingv2"
 
-    iniset $NOVA_CONF oslo_messaging_notifications topics "notifications,watcher_notifications"
-    iniset $NOVA_CONF notifications notify_on_state_change "vm_and_task_state"
-
     configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR
     configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR "watcher_clients_auth"
 
diff --git a/devstack/local.conf.compute b/devstack/local.conf.compute
index 79d0aebcc..09ee804b7 100644
--- a/devstack/local.conf.compute
+++ b/devstack/local.conf.compute
@@ -44,6 +44,3 @@ LOGDAYS=2
 [[post-config|$NOVA_CONF]]
 [DEFAULT]
 compute_monitors=cpu.virt_driver
-notify_on_state_change = vm_and_task_state
-[notifications]
-notify_on_state_change = vm_and_task_state
diff --git a/devstack/local.conf.controller b/devstack/local.conf.controller
index 9bf4956a9..b7a2fe924 100644
--- a/devstack/local.conf.controller
+++ b/devstack/local.conf.controller
@@ -48,6 +48,3 @@ LOGDAYS=2
 [[post-config|$NOVA_CONF]]
 [DEFAULT]
 compute_monitors=cpu.virt_driver
-notify_on_state_change = vm_and_task_state
-[notifications]
-notify_on_state_change = vm_and_task_state