diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java
index 18f611972774e711afa94b566a38cfa1d2bd40a1..4d84fcf05ff666d50b9add38a8758579082a3641 100644
--- a/core/java/src/net/i2p/client/I2PSessionImpl2.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java
@@ -242,9 +242,13 @@ class I2PSessionImpl2 extends I2PSessionImpl {
             _sendingStates.remove(state);
         }
         long afterRemovingSync = _context.clock().now();
-        boolean found = state.received(MessageStatusMessage.STATUS_SEND_GUARANTEED_SUCCESS);
+        boolean found = false;
         boolean accepted = state.received(MessageStatusMessage.STATUS_SEND_ACCEPTED);
-
+        if (isGuaranteed())
+            found = state.received(MessageStatusMessage.STATUS_SEND_GUARANTEED_SUCCESS);
+        else
+            found = accepted;
+        
         if ((!accepted) || (state.getMessageId() == null)) {
             if (_log.shouldLog(Log.CRIT))
                 _log.log(Log.CRIT, getPrefix() + "State with nonce " + state.getNonce()