diff --git a/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java b/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
index 470849d9..35872b67 100644
--- a/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
+++ b/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
@@ -66,7 +66,7 @@ public class XPipeInstallation {
 
     public static String getLocalDefaultInstallationBasePath(boolean acceptCustomHome) {
         var customHome = System.getenv("XPIPE_HOME");
-        if (!customHome.isEmpty() && acceptCustomHome) {
+        if (customHome != null && !customHome.isEmpty() && acceptCustomHome) {
             return customHome;
         }