diff --git a/launcher.sh b/launcher.sh
index 5ca04ac..d46ec4e 100644
--- a/launcher.sh
+++ b/launcher.sh
@@ -47,4 +47,12 @@ if [ ! -f /owntracks/mosquitto/mosquitto.acl ]; then
 	cp /etc/mosquitto/mosquitto.acl /owntracks/mosquitto/mosquitto.acl
 fi
 
+# Put ot-recorder defaults in volume
+if [ ! -f /owntracks/etc/default/ot-recorder ]; then
+    mkdir -p /owntracks/etc/default/
+	mv /etc/default/ot-recorder /owntracks/etc/default/ot-recorder
+fi
+# copy ot-recorder defaults back to /etc/default/
+cp /owntracks/etc/default/ot-recorder /etc/default/ot-recorder
+
 exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
diff --git a/ot-recorder.default b/ot-recorder.default
index 6452a66..0addfae 100644
--- a/ot-recorder.default
+++ b/ot-recorder.default
@@ -4,3 +4,4 @@
 # and its associated utilities to override compiled-in defaults.
 
 OTR_STORAGEDIR = "/owntracks/recorder/store"
+OTR_TOPICS = "owntracks/#"
diff --git a/supervisord.conf b/supervisord.conf
index e5c847c..b905326 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -20,7 +20,7 @@ auto_start=true
 autorestart=true
 
 [program:recorder]
-command=/usr/sbin/ot-recorder --http-host 0.0.0.0 'owntracks/#'
+command=/usr/sbin/ot-recorder --http-host 0.0.0.0
 redirect_stderr=true
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0