diff --git a/etc/ot-recorder.default b/etc/ot-recorder.default
index 9ce5e77..212f1e0 100644
--- a/etc/ot-recorder.default
+++ b/etc/ot-recorder.default
@@ -92,5 +92,5 @@
 # List of topics for MQTT to subscribe to, blank separated in a string
 #
 
-# OTR_TOPICS="owntracks/+/+"
+OTR_TOPICS="owntracks/#"
 
diff --git a/etc/ot-recorder.service b/etc/ot-recorder.service
index 05a4bcd..1f261cb 100644
--- a/etc/ot-recorder.service
+++ b/etc/ot-recorder.service
@@ -2,6 +2,8 @@
 
 [Unit]
 Description=OwnTracks Recorder
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=simple