diff --git a/src/main/resources/lua/apn/get.lua b/src/main/resources/lua/apn/get.lua
index 7c79e97f5..247e7ba89 100644
--- a/src/main/resources/lua/apn/get.lua
+++ b/src/main/resources/lua/apn/get.lua
@@ -36,7 +36,11 @@ local getNextInterval = function(interval)
         return 600000
     end
 
-    return 1800000
+    if interval < 1800000 then
+        return 1800000
+    end
+
+    return 3600000
 end
 
 
diff --git a/src/main/resources/lua/apn/insert.lua b/src/main/resources/lua/apn/insert.lua
index e9ac5971f..bf48426c8 100644
--- a/src/main/resources/lua/apn/insert.lua
+++ b/src/main/resources/lua/apn/insert.lua
@@ -1,6 +1,7 @@
 -- keys: pending (KEYS[1]), user (KEYS[2])
 -- args: timestamp (ARGV[1]), interval (ARGV[2]), account (ARGV[3]), device (ARGV[4])
 
+redis.call("HSET", KEYS[2], "created", ARGV[1])
 redis.call("HSET", KEYS[2], "interval", ARGV[2])
 redis.call("HSET", KEYS[2], "account", ARGV[3])
 redis.call("HSET", KEYS[2], "device", ARGV[4])