diff --git a/src/power.sh b/src/power.sh
index 9ca5583..136c303 100644
--- a/src/power.sh
+++ b/src/power.sh
@@ -104,8 +104,7 @@ finish() {
   pid="/var/run/tpm.pid"
   [ -s "$pid" ] && pKill "$(<"$pid")"
 
-  pid="/var/run/wsdd.pid"
-  [ -s "$pid" ] && pKill "$(<"$pid")"
+  fKill "wsdd2"
 
   fKill "smbd"
 
diff --git a/src/samba.sh b/src/samba.sh
index 43a83b8..ab037ea 100644
--- a/src/samba.sh
+++ b/src/samba.sh
@@ -129,8 +129,7 @@ if [[ "${BOOT_MODE:-}" == "windows_legacy" ]]; then
   fi
 else
   # Enable Web Service Discovery on Vista and up
-  wsdd2 -i "$interface" -H "$hostname" -N "$hostname" &
-  echo "$!" > /var/run/wsdd.pid
+  (sleep 30; wsdd2 -i "$interface" -N "$hostname" -d) &
 fi
 
 return 0