diff --git a/etc/systemd/system/render-infinity.service b/etc/systemd/system/render-infinity.service
index a016046..9afaad8 100644
--- a/etc/systemd/system/render-infinity.service
+++ b/etc/systemd/system/render-infinity.service
@@ -9,7 +9,7 @@ User=pandora
 Group=pandora
 Nice=19
 WorkingDirectory=/srv/pandora/pandora
-ExecStart=/srv/pandora/pandora/manage.py infinity --config /etc/infinity.json
+ExecStart=/srv/pandora/pandora/manage.py infinity
 
 [Install]
 WantedBy=multi-user.target
diff --git a/render.py b/render.py
index b0f7b7d..59b4654 100644
--- a/render.py
+++ b/render.py
@@ -717,6 +717,7 @@ def update_m3u(render_prefix, exclude=[]):
     shutil.move(front_m3u_f + "_", front_m3u_f)
 
 def render_infinity(options):
+    options = load_defaults(options)
     prefix = options['prefix']
     duration = int(options['duration'])