diff --git a/papermerge/rootfs/etc/cont-init.d/99-configuration b/papermerge/rootfs/etc/cont-init.d/99-configuration
index a3f09d42c..9c6a843cd 100644
--- a/papermerge/rootfs/etc/cont-init.d/99-configuration
+++ b/papermerge/rootfs/etc/cont-init.d/99-configuration
@@ -5,7 +5,7 @@
 ##################
 
   #Set media dir
-  MEDIADIR=$(bashio::config 'storage_dir') 
+  MEDIADIR='"'$(bashio::config 'storage_dir')'"'
   #clean data
   sed -i '/MEDIA_DIR/d' /data/config/papermerge.conf.py
   #add data
@@ -13,7 +13,7 @@
   bashio::log.info "Storage dir set to $MEDIADIR"
 
   #Set import dir
-  IMPORTDIR="$(bashio::config 'import_dir')"
+  IMPORTDIR='"'$(bashio::config 'import_dir')'"'
   sed -i "2 i\export IMPORTER_DIR=$IMPORTDIR" /etc/services.d/papermerge/run
   bashio::log.info "Import dir set to $IMPORTDIR"