diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java
index e04a1fea0..abd42e034 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java
@@ -108,6 +108,10 @@ public class AppPrefsStorageHandler {
             return defaultObject;
         }
 
+        if (tree.isNull()) {
+            return null;
+        }
+
         if (PrefsChoiceValue.class.isAssignableFrom(type.getRawClass())) {
             List<T> all = (List<T>) getAll(type.getRawClass());
             if (all != null) {