diff --git a/debian/scripts/koha-disable b/debian/scripts/koha-disable
index c8d699435f..fffb119a07 100755
--- a/debian/scripts/koha-disable
+++ b/debian/scripts/koha-disable
@@ -72,9 +72,11 @@ do
             if is_indexer_running $name; then
                 koha-indexer --stop $name
             fi
-            if is_worker_running $name; then
-                koha-worker --stop $name
-            fi
+            for queue in $(get_worker_queues); do
+                if is_worker_running $name $queue; then
+                    koha-worker --queue $queue --stop $name
+                fi
+            done
         elif [ "$RET" = 2 ]; then
             warn "Error: Apache configuration file not present for instance $name."
         else