diff --git a/app/src/main/java/io/xpipe/app/util/ScanDialog.java b/app/src/main/java/io/xpipe/app/util/ScanDialog.java
index e0f04530a..f4a36d7fb 100644
--- a/app/src/main/java/io/xpipe/app/util/ScanDialog.java
+++ b/app/src/main/java/io/xpipe/app/util/ScanDialog.java
@@ -98,8 +98,10 @@ class ScanDialog extends DialogComp {
     @Override
     protected void discard() {
         ThreadHelper.runAsync(() -> {
-            shellValidationContext.close();
-            shellValidationContext = null;
+            if (shellValidationContext != null) {
+                shellValidationContext.close();
+                shellValidationContext = null;
+            }
         });
     }