diff --git a/portainer_agent/rootfs/etc/services.d/portainer_agent/run b/portainer_agent/rootfs/etc/services.d/portainer_agent/run
index 4041b1b95..ed08c3555 100644
--- a/portainer_agent/rootfs/etc/services.d/portainer_agent/run
+++ b/portainer_agent/rootfs/etc/services.d/portainer_agent/run
@@ -11,4 +11,8 @@ bashio::log.info "Starting app"
 
 # Launch app
 cd /app || true
-./agent "$PORTAINER_AGENT_ARGS" 2>/dev/null || ./agent
+if bashio::config.has_value 'PORTAINER_AGENT_ARGS'; then
+  ./agent "$PORTAINER_AGENT_ARGS" 2>/dev/null
+else
+  ./agent
+fi