diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
index 1fc9ca94..3ab812d4 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -231,7 +231,7 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public Uri getUserFilesWebDavUri() {
-        return mCredentials instanceof OwnCloudAnonymousCredentials
+        return (mCredentials instanceof OwnCloudAnonymousCredentials || mAccount == null)
                 ? Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0)
                 : Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0 + AccountUtils.getUserId(
                 mAccount.getSavedAccount(), getContext()