diff --git a/router/java/src/net/i2p/router/time/RouterTimestamper.java b/router/java/src/net/i2p/router/time/RouterTimestamper.java
index cde08d093d47029aa440bc52911382af6f17c05c..88d837a02da7c3576edfd207f1c76f62a9c12d0a 100644
--- a/router/java/src/net/i2p/router/time/RouterTimestamper.java
+++ b/router/java/src/net/i2p/router/time/RouterTimestamper.java
@@ -45,6 +45,7 @@ public class RouterTimestamper extends Timestamper {
     private static final int MAX_CONSECUTIVE_FAILS = 10;
     private static final int DEFAULT_TIMEOUT = 10*1000;
     private static final int SHORT_TIMEOUT = 5*1000;
+    private static final long MAX_WAIT_INITIALIZATION = 45*1000;
     
     public static final String PROP_QUERY_FREQUENCY = "time.queryFrequencyMs";
     public static final String PROP_SERVER_LIST = "time.sntpServerList";
@@ -141,7 +142,7 @@ public class RouterTimestamper extends Timestamper {
         try { 
             synchronized (this) {
                 if (!_initialized)
-                    wait();
+                    wait(MAX_WAIT_INITIALIZATION);
             }
         } catch (InterruptedException ie) {}
     }