diff --git a/cw_bitcoin/lib/payjoin/manager.dart b/cw_bitcoin/lib/payjoin/manager.dart
index 6bd2eb07b..95a523d89 100644
--- a/cw_bitcoin/lib/payjoin/manager.dart
+++ b/cw_bitcoin/lib/payjoin/manager.dart
@@ -121,15 +121,13 @@ class PayjoinManager {
           }
         } catch (e) {
           _cleanupSession(pjUri);
-          printV(e);
-          await _payjoinStorage.markSenderSessionUnrecoverable(pjUri);
-          completer.completeError(e);
+          await _payjoinStorage.markSenderSessionUnrecoverable(pjUri, e.toString());
+          completer.complete();
         }
       } else if (message is PayjoinSessionError) {
         _cleanupSession(pjUri);
         if (message is UnrecoverableError) {
-          printV(message.message);
-          await _payjoinStorage.markSenderSessionUnrecoverable(pjUri);
+          await _payjoinStorage.markSenderSessionUnrecoverable(pjUri, message.message);
           completer.complete();
         } else if (message is RecoverableError) {
           completer.complete();
diff --git a/cw_bitcoin/lib/payjoin/storage.dart b/cw_bitcoin/lib/payjoin/storage.dart
index e2f7a8d15..5fb9d5716 100644
--- a/cw_bitcoin/lib/payjoin/storage.dart
+++ b/cw_bitcoin/lib/payjoin/storage.dart
@@ -84,10 +84,11 @@ class PayjoinStorage {
     await session.save();
   }
 
-  Future<void> markSenderSessionUnrecoverable(String pjUrl) async {
+  Future<void> markSenderSessionUnrecoverable(String pjUrl, String reason) async {
     final session = _payjoinSessionSources.get("$_senderPrefix$pjUrl")!;
 
     session.status = PayjoinSessionStatus.unrecoverable.name;
+    session.error = reason;
     await session.save();
   }