diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index f250be3d5665682746575d73882ddbd84d8656ba..e80c91237e9a82982c4e1ad0bdcc8f119e8c6519 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -1406,9 +1406,9 @@ public class Router implements RouterClock.ClockShiftListener {
             return 0;
         long exp = _context.tunnelManager().getLastParticipatingExpiration();
         if (exp < 0)
-            return -1;
+            return 0;
         else
-            return exp + 2*CLOCK_FUDGE_FACTOR - _context.clock().now();
+            return Math.max(0, exp + 2*CLOCK_FUDGE_FACTOR - _context.clock().now());
     }
     
     /**