diff --git a/util/templates/includes/ocpp.tpl b/util/templates/includes/ocpp.tpl
index 99d60ecc47..e5739975af 100644
--- a/util/templates/includes/ocpp.tpl
+++ b/util/templates/includes/ocpp.tpl
@@ -15,7 +15,7 @@ remotestart: {{ .remotestart }}
 {{- if ne .connecttimeout "5m" }}
 connecttimeout: {{ .connecttimeout }}
 {{- end }}
-{{- if ne .timeout "30s" }}
+{{- if and .timeout (ne .timeout "30s") }}
 timeout: {{ .timeout }}
 {{- end }}
 {{- end }}