diff --git a/app/src/main/java/io/xpipe/app/util/DataStoreFormatter.java b/app/src/main/java/io/xpipe/app/util/DataStoreFormatter.java
index 620cd5f15..cbf9d0103 100644
--- a/app/src/main/java/io/xpipe/app/util/DataStoreFormatter.java
+++ b/app/src/main/java/io/xpipe/app/util/DataStoreFormatter.java
@@ -61,6 +61,10 @@ public class DataStoreFormatter {
             return null;
         }
 
+        if (name.isEmpty()) {
+            return name;
+        }
+
         return name.substring(0, 1).toUpperCase() + name.substring(1).toLowerCase();
     }