diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index 23e2fe27..4c9aa3fc 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -851,7 +851,8 @@ QString UBSettings::userDataDirectory()
 
         }
         dataDirPath = UBFileSystemUtils::normalizeFilePath(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
-        dataDirPath.replace(qApp->organizationName() + "/", "");
+        if (qApp->organizationName().size() > 0)
+            dataDirPath.replace(qApp->organizationName() + "/", "");
     }
     return dataDirPath;
 }