diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba
index 88c45c4061..62ea24a57f 100644
--- a/packages/network/samba/scripts/52_samba
+++ b/packages/network/samba/scripts/52_samba
@@ -22,35 +22,28 @@
 #
 # runlevels: openelec, textmode
 
-SMB_USERCONF="/storage/.config/samba.conf"
-SMB_DEFCONF="/etc/samba/smb.conf"
+(
+  if [ -f /var/config/settings.conf ]; then
+    . /var/config/settings.conf
 
-case $RUNLEVEL in
-  boot)
-    (
-      if [ -f /var/config/settings.conf ]; then
-        . /var/config/settings.conf
+    if [ "$SAMBA_START" = "true" ]; then
 
-        if [ "$SAMBA_START" = "true" ]; then
+      wait_for_network
 
-          wait_for_network
+      progress  "Starting Samba server"
 
-          progress  "Starting Samba server"
+      SMB_USERCONF="/storage/.config/samba.conf"
+      SMB_DEFCONF="/etc/samba/smb.conf"
 
-          if [ -f $SMB_USERCONF ]; then
-            SMB_ARG="--configfile=$SMB_USERCONF"
-          else
-            SMB_ARG="--configfile=$SMB_DEFCONF"
-          fi
-
-          mkdir -p /var/log/samba
-          smbd --daemon $SMB_ARG > /dev/null 2>&1
-          nmbd --daemon $SMB_ARG > /dev/null 2>&1
-        fi
+      if [ -f $SMB_USERCONF ]; then
+        SMB_ARG="--configfile=$SMB_USERCONF"
+      else
+        SMB_ARG="--configfile=$SMB_DEFCONF"
       fi
-    )&
-    ;;
 
-  poweroff|reboot)
-    ;;
-esac
+      mkdir -p /var/log/samba
+      smbd --daemon $SMB_ARG > /dev/null 2>&1
+      nmbd --daemon $SMB_ARG > /dev/null 2>&1
+    fi
+  fi
+)&