diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
index c923963d2..0d70ae69d 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
@@ -31,7 +31,7 @@ public class ControllerPollProperties {
      * Maximum polling time that can be configured by a tenant in HH:MM:SS
      * notation.
      */
-    private String maxPollingTime = "23:59:00";
+    private String maxPollingTime = "23:59:59";
 
     /**
      * Minimum polling time that can be configured by a tenant in HH:MM:SS
diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java
index 8e7c46223..b87cf524a 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java
@@ -37,7 +37,7 @@ public final class DurationHelper {
         }
 
         public boolean isWithinRange(final Duration duration) {
-            return duration.compareTo(min) > 0 && duration.compareTo(max) < 0;
+            return duration.compareTo(min) >= 0 && duration.compareTo(max) <= 0;
         }
     }