diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 3d6045de53..33f1824239 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -258,6 +258,10 @@ function install_redis {
 
 }
 
+function stop_redis {
+    stop_service redis || true
+}
+
 function uninstall_redis {
     if is_fedora; then
         uninstall_package redis
@@ -266,9 +270,6 @@ function uninstall_redis {
     elif is_suse; then
         uninstall_package redis
     fi
-
-    stop_service redis
-
 }
 
 function octavia_configure {
@@ -658,6 +659,10 @@ function octavia_stop {
     else
         die "Unknown network controller. Please define octavia_delete_network_interface_device"
     fi
+
+    if [[ ${OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD} == True ]]; then
+        stop_redis
+    fi
 }
 
 function octavia_cleanup {