diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java
index e9ad60a1c..7ed5e90c1 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java
@@ -8,6 +8,7 @@
  */
 package org.eclipse.hawkbit.amqp;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,7 +26,7 @@ public class AmqpDeadletterProperties {
      * Message time to live (ttl) for the deadletter queue. Default ttl is 3
      * weeks.
      */
-    private int ttl = 1_814_400_000;
+    private long ttl = Duration.ofDays(21).toMillis();
 
     /**
      * Return the deadletter arguments.
@@ -57,11 +58,11 @@ public class AmqpDeadletterProperties {
         return args;
     }
 
-    public int getTtl() {
+    public long getTtl() {
         return ttl;
     }
 
-    public void setTtl(final int ttl) {
+    public void setTtl(final long ttl) {
         this.ttl = ttl;
     }