diff --git a/roles/systemd-docker-service/templates/service.j2 b/roles/systemd-docker-service/templates/service.j2
index 24b43e1..7028fde 100644
--- a/roles/systemd-docker-service/templates/service.j2
+++ b/roles/systemd-docker-service/templates/service.j2
@@ -38,7 +38,8 @@ ExecStart=/usr/bin/docker run --name=%n \
 {% endif %}
 {% if systemd_docker_log_driver is defined %}
     --log-driver {{ systemd_docker_log_driver }} \
-{% if systemd_docker_log_driver is "json-file" %}
+{% endif %}
+{% if systemd_docker_log_driver is not defined or systemd_docker_log_driver == "json-file" %}
 {% if systemd_docker_log_opt_max_file is not defined %}
 {% set systemd_docker_log_opt_max_file "2" %}
 {% endif %}
@@ -46,7 +47,6 @@ ExecStart=/usr/bin/docker run --name=%n \
 {% set systemd_docker_log_opt_max_size "10m" %}
 {% endif %}
 {% endif %}
-{% endif %}
 {% if systemd_docker_log_opt_max_file is defined %}
     --log-opt max-file={{ systemd_docker_log_opt_max_file }} \
 {% endif %}