diff --git a/libi2pd_client/I2CP.cpp b/libi2pd_client/I2CP.cpp
index 55da9924..519f4ed6 100644
--- a/libi2pd_client/I2CP.cpp
+++ b/libi2pd_client/I2CP.cpp
@@ -295,7 +295,9 @@ namespace client
 		auto garlic = remoteSession->WrapSingleMessage (msg);
 		// send
 		bool sent = SendMsg (garlic, outboundTunnel, remoteLease);
-		m_Owner->SendMessageStatusMessage (nonce, eI2CPMessageStatusGuaranteedSuccess);
+		m_Owner->SendMessageStatusMessage (nonce, sent ? eI2CPMessageStatusGuaranteedSuccess : eI2CPMessageStatusGuaranteedFailure);
+		if (!sent)
+			remoteSession->SetSharedRoutingPath (nullptr);
 		return sent;
 	}