diff --git a/devstack/lib/watcher b/devstack/lib/watcher
index 098095f31..80723cc58 100644
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -129,6 +129,7 @@ function create_watcher_conf {
     iniset $WATCHER_CONF oslo_messaging_notifications driver "messaging"
 
     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 59e8a4c0e..416dd482c 100644
--- a/devstack/local.conf.compute
+++ b/devstack/local.conf.compute
@@ -44,3 +44,6 @@ 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 9002a3df3..bbc3d004f 100644
--- a/devstack/local.conf.controller
+++ b/devstack/local.conf.controller
@@ -45,3 +45,6 @@ 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