diff --git a/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java b/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
index 0552d72b2..300674039 100644
--- a/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
+++ b/app/src/main/java/io/xpipe/app/browser/FileSystemHelper.java
@@ -73,6 +73,10 @@ public class FileSystemHelper {
             return null;
         }
 
+        if (model.getFileSystem() == null) {
+            return path;
+        }
+
         var shell = model.getFileSystem().getShell();
         if (shell.isEmpty()) {
             return path;
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index e48f7123a..a37225a11 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -706,6 +706,10 @@ public abstract class DataStorage {
             return "?";
         }
 
+        if (!store.getValidity().isUsable()) {
+            return "?";
+        }
+
         return store.getProvider().browserDisplayName(store.getStore());
     }