diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup
index 8302ddb13f..b24ecf6963 100755
--- a/dist/common/scripts/scylla_setup
+++ b/dist/common/scripts/scylla_setup
@@ -204,7 +204,6 @@ fi
 if [ $ENABLE_SERVICE -eq 1 ]; then
     if [ "$ID" = "fedora" ] || [ "$ID" = "centos" ]; then
         systemctl enable scylla-server.service
-        systemctl enable scylla-jmx.service
         systemctl enable collectd.service
     fi
 fi
diff --git a/dist/common/systemd/scylla-server.service.in b/dist/common/systemd/scylla-server.service.in
index 0d22daa518..6b79876232 100644
--- a/dist/common/systemd/scylla-server.service.in
+++ b/dist/common/systemd/scylla-server.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Scylla Server
+Wants=scylla-jmx.service
 
 [Service]
 PermissionsStartOnly=true