diff --git a/server/core/config.c b/server/core/config.c
index 2559fec02..2ca6dcdab 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -135,6 +135,7 @@ static char *service_params[] =
     "ignore_databases_regex",
     "log_auth_warnings",
     "source", /**< Avrorouter only */
+    "retry_on_failure",
     NULL
 };
 
diff --git a/server/core/service.c b/server/core/service.c
index ddb9ec99b..1aa106eb3 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -452,6 +452,9 @@ int serviceStartAllPorts(SERVICE* service)
                            (void*) service, retry_after);
             MXS_NOTICE("Failed to start service %s, retrying in %d seconds.",
                        service->name, retry_after);
+
+            /** This will prevent MaxScale from shutting down if service start is retried later */
+            listeners = 1;
         }
     }
     else