diff --git a/app/src/main/java/io/xpipe/app/exchange/AskpassExchangeImpl.java b/app/src/main/java/io/xpipe/app/exchange/AskpassExchangeImpl.java
index af63c534..324e8e4e 100644
--- a/app/src/main/java/io/xpipe/app/exchange/AskpassExchangeImpl.java
+++ b/app/src/main/java/io/xpipe/app/exchange/AskpassExchangeImpl.java
@@ -57,8 +57,11 @@ public class AskpassExchangeImpl extends AskpassExchange
                 })
                 .orElse(null);
 
-        passwords.put(msg.getId(), r);
-        requestToId.put(msg.getRequest(), msg.getId());
+        // If the result is null, assume that the operation was aborted by the user
+        if (r != null) {
+            passwords.put(msg.getId(), r);
+            requestToId.put(msg.getRequest(), msg.getId());
+        }
 
         return Response.builder().value(r != null ? r.getSecretValue() : null).build();
     }