diff --git a/app/docker/views/services/create/createServiceController.js b/app/docker/views/services/create/createServiceController.js
index 5d92ffdbd..debd7de52 100644
--- a/app/docker/views/services/create/createServiceController.js
+++ b/app/docker/views/services/create/createServiceController.js
@@ -103,7 +103,7 @@ angular.module('portainer.docker').controller('CreateServiceController', [
       Interval: '',
       Timeout: '',
       StartPeriod: '',
-      Retries: 3,
+      Retries: undefined,
     };
 
     $scope.state = {
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html
index 26c08d7dc..b590adadb 100644
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@@ -355,7 +355,7 @@
                   </div>
                   <label for="service_retries" class="col-sm-2 col-lg-1 control-label text-left">Retries</label>
                   <div class="col-sm-4">
-                    <input type="number" class="form-control" ng-model="formValues.Retries" id="service_retries" placeholder="3" />
+                    <input type="number" class="form-control" ng-model="formValues.Retries" id="service_retries" placeholder="0" />
                   </div>
                 </div>
                 <!-- !healthcheck-start-period-retries -->
diff --git a/app/docker/views/services/edit/includes/healthcheck.html b/app/docker/views/services/edit/includes/healthcheck.html
index 80b4f1822..440e0a2c2 100644
--- a/app/docker/views/services/edit/includes/healthcheck.html
+++ b/app/docker/views/services/edit/includes/healthcheck.html
@@ -94,7 +94,7 @@
                 ng-model="service.HealthCheck.Retries"
                 ng-change="updateServiceAttribute(service, 'HealthCheck.Retries')"
                 disable-authorization="DockerServiceUpdate"
-                placeholder="3"
+                placeholder="0"
               />
             </td>
             <td>
diff --git a/app/docker/views/services/edit/serviceController.js b/app/docker/views/services/edit/serviceController.js
index 01a75cea6..9852b115e 100644
--- a/app/docker/views/services/edit/serviceController.js
+++ b/app/docker/views/services/edit/serviceController.js
@@ -479,7 +479,7 @@ angular.module('portainer.docker').controller('ServiceController', [
             Interval: ServiceHelper.translateHumanDurationToNanos(service.HealthCheck.Interval),
             Timeout: ServiceHelper.translateHumanDurationToNanos(service.HealthCheck.Timeout),
             StartPeriod: ServiceHelper.translateHumanDurationToNanos(service.HealthCheck.StartPeriod),
-            Retries: service.HealthCheck.Retries || 3,
+            Retries: service.HealthCheck.Retries || undefined,
           };
         } else {
           delete config.TaskTemplate.ContainerSpec.HealthCheck;