diff --git a/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in b/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in
index 1ac1588466..5e773ec69b 100644
--- a/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in
+++ b/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in
@@ -22,6 +22,8 @@ RemoveIPC=yes
 RestrictAddressFamilies=AF_INET AF_INET6
 Type=oneshot
 ExecStart=@SBINDIR@/nvme connect-all --context=autoconnect
+RemainAfterExit=true
+ExecStop=@SBINDIR@/nvme disconnect-all
 
 [Install]
 WantedBy=default.target