diff --git a/app/src/main/java/io/xpipe/app/util/SecretQuery.java b/app/src/main/java/io/xpipe/app/util/SecretQuery.java
index 5cfd47068..038a5abf7 100644
--- a/app/src/main/java/io/xpipe/app/util/SecretQuery.java
+++ b/app/src/main/java/io/xpipe/app/util/SecretQuery.java
@@ -25,7 +25,7 @@ public interface SecretQuery {
 
                 var inPlace = found.get().getSecret().inPlace();
                 var r = AskpassAlert.queryRaw(prompt, inPlace);
-                return r.isCancelled() ? Optional.empty() : found;
+                return r.isCancelled() ? Optional.of(r) : found;
             }
 
             @Override
diff --git a/app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java b/app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java
index 84fb81cc3..2dd2025e4 100644
--- a/app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java
+++ b/app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java
@@ -87,7 +87,9 @@ public class SecretQueryProgress {
         }
 
         if (shouldCache) {
+            countDown.pause();
             var cached = sup.retrieveCache(prompt, ref);
+            countDown.resume();
             if (cached.isPresent()) {
                 if (cached.get().isCancelled()) {
                     requestCancelled = true;