diff --git a/conf/config.properties b/conf/config.properties
index 12d4a9cf6..312e888b3 100644
--- a/conf/config.properties
+++ b/conf/config.properties
@@ -106,7 +106,7 @@ peername=anonymous
 
 # a loklak instance can upgrade itself, by default every 24 hours
 # if an automatic update is not wanted, set this to i.e. ten years
-upgradeInterval = 86400000
+upgradeInterval = 24
 
 # settings to prevent DoS
 DoS.blackout = 100
diff --git a/src/org/loklak/LoklakServer.java b/src/org/loklak/LoklakServer.java
index d12de5d65..dcde49ecb 100644
--- a/src/org/loklak/LoklakServer.java
+++ b/src/org/loklak/LoklakServer.java
@@ -143,6 +143,7 @@
 import org.loklak.stream.StreamServlet;
 import org.loklak.tools.Browser;
 import org.loklak.tools.OS;
+import org.loklak.tools.DateParser;
 
 
 public class LoklakServer {
@@ -308,7 +309,7 @@ public static void main(String[] args) throws Exception {
 
 
         // read upgrade interval
-        Caretaker.upgradeTime = Caretaker.startupTime + DAO.getConfig("upgradeInterval", 86400000);
+        Caretaker.upgradeTime = Caretaker.startupTime + DAO.getConfig("upgradeInterval", 24) * DateParser.HOUR_MILLIS;
 
         // if this is not headless, we can open a browser automatically
         Browser.openBrowser("http://127.0.0.1:" + httpPort + "/");