diff --git a/packages/network/samba/system.d.opt/nmbd.service b/packages/network/samba/system.d.opt/nmbd.service
index c77d65c86b..a2dc1b35a2 100644
--- a/packages/network/samba/system.d.opt/nmbd.service
+++ b/packages/network/samba/system.d.opt/nmbd.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Samba NMB Daemon
-After=network.target samba-config.service
+Wants=network-online.target samba-config.service
+After=network-online.target samba-config.service
 ConditionPathExists=!/storage/.cache/services/samba.disabled
 ConditionPathExists=/run/samba/smb.conf
-Wants=samba-config.service
 
 [Service]
 Type=forking
diff --git a/packages/network/samba/system.d.opt/smbd.service b/packages/network/samba/system.d.opt/smbd.service
index 4fa7e23b44..4353fa2667 100644
--- a/packages/network/samba/system.d.opt/smbd.service
+++ b/packages/network/samba/system.d.opt/smbd.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Samba SMB Daemon
-After=network.target samba-config.service
+Wants=network-online.target nmbd.service
+After=network-online.target nmbd.service
 ConditionPathExists=!/storage/.cache/services/samba.disabled
 ConditionPathExists=/run/samba/smb.conf
-Wants=samba-config.service
 
 [Service]
 Type=forking