diff --git a/systemd/nbd@.service.sh.in b/systemd/nbd@.service.sh.in
index b1f68f04..7d5f88a4 100644
--- a/systemd/nbd@.service.sh.in
+++ b/systemd/nbd@.service.sh.in
@@ -14,9 +14,8 @@ After=network-online.target
 Conflicts=shutdown.target
 DefaultDependencies=no
 [Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@sbindir@/nbd-client %i
+Type=simple
+ExecStart=@sbindir@/nbd-client -nofork %i
 ExecStop=@sbindir@/nbd-client -d %i
 [Install]
 RequiredBy=dev-%i.device