diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba
index c66087392b..decc78b647 100644
--- a/packages/network/samba/scripts/52_samba
+++ b/packages/network/samba/scripts/52_samba
@@ -22,11 +22,13 @@
 #
 # runlevels: openelec, textmode
 
-(
-  if [ -f /storage/.config/network.conf ]; then
-    . /storage/.config/network.conf
+OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
 
-    if [ ! "$SAMBA_START" = "no" ]; then
+(
+  if [ -f "$OPENELEC_SETTINGS" ]; then
+    SAMBA_START=`grep SAMBA_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+
+    if [ "$SAMBA_START" = "yes" ]; then
 
       wait_for_network