diff --git a/mopidy/run.sh b/mopidy/run.sh
index f998db6..ebd6080 100644
--- a/mopidy/run.sh
+++ b/mopidy/run.sh
@@ -2,10 +2,10 @@
 set -e
 
 local_scan=$(cat /data/options.json | jq -r '.local_scan // empty')
-options=$(cat /data/options.json | jq -r 'if .options then [.options[] | "-o "+.name+"="+.value ] | join(" ") else "" end')
+options=$(cat /data/options.json | jq -r 'if .options then [.options[] | "-o "+"\""+.name+"="+.value+"\"" ] | join(" ") else "" end')
 config="/var/lib/mopidy/.config/mopidy/mopidy.conf"
 
 if  [ "$local_scan" == "true" ]; then
-    mopidy --config $config $options local scan
+    eval mopidy --config $config $options local scan
 fi
-mopidy --config $config $options
+eval mopidy --config $config $options