diff --git a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
index 002c740f0..255c6a786 100644
--- a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
+++ b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
@@ -50,7 +50,7 @@ public class SendMessageDirectJob extends JobImpl {
         _message = message;
         _targetHash = toPeer;
         _router = null;
-        if (timeoutMs <= 30) {
+        if (timeoutMs <= 30*1000) {
             _expiration = ctx.clock().now() + 30*1000;
         } else {
             _expiration = timeoutMs + ctx.clock().now();
diff --git a/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java b/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
index 866d01b6f..774a7897e 100644
--- a/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
+++ b/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
@@ -85,7 +85,7 @@ public class SendTunnelMessageJob extends JobImpl {
                           new Exception("SendTunnel from"));
         }
         //_log.info("Send tunnel message " + msg.getClass().getName() + " to " + _destRouter + " over " + _tunnelId + " targetting tunnel " + _targetTunnelId, new Exception("SendTunnel from"));
-        if (timeoutMs < 30) {
+        if (timeoutMs < 30*1000) {
             _expiration = getContext().clock().now() + 30*1000;
         } else {
             _expiration = getContext().clock().now() + timeoutMs;