diff --git a/packages/addons/service/tvheadend42/source/bin/tvheadend42.start b/packages/addons/service/tvheadend42/source/bin/tvheadend42.start
index 8805762d53..cf9955af75 100755
--- a/packages/addons/service/tvheadend42/source/bin/tvheadend42.start
+++ b/packages/addons/service/tvheadend42/source/bin/tvheadend42.start
@@ -37,6 +37,11 @@ if [ -f "$ADDON_HOME/dvr/config/dvr-config" ]; then
   rm $ADDON_HOME/dvr/config/dvr-config
 fi
 
+# workaround to create default Tvh directories without entering samba share
+if [ ! -d "/storage/recordings" ]; then
+  mkdir -p /storage/recordings /storage/picons/tvh /storage/picons/vdr
+fi
+
 if [ -f "$ADDON_HOME/channel/config/config.tmp" ]; then
   rm $ADDON_HOME/channel/config/config.tmp
 fi