diff --git a/renku/core/init.py b/renku/core/init.py
index 343cede0f1..801f8eb7ce 100644
--- a/renku/core/init.py
+++ b/renku/core/init.py
@@ -32,9 +32,9 @@
 from renku.core.githooks import install_githooks
 from renku.core.image import ImageObjectRequest
 from renku.core.interface.database_gateway import IDatabaseGateway
+from renku.core.lfs import init_external_storage, storage_installed
 from renku.core.migration.utils import OLD_METADATA_PATH
 from renku.core.project import set_project_image
-from renku.core.storage import init_external_storage, storage_installed
 from renku.core.template.template import (
     FileAction,
     RenderedTemplate,
diff --git a/renku/core/session/renkulab.py b/renku/core/session/renkulab.py
index b11d0c333b..82f70c25a1 100644
--- a/renku/core/session/renkulab.py
+++ b/renku/core/session/renkulab.py
@@ -267,8 +267,9 @@ def get_cloudstorage(self):
         """Get cloudstorage configured for the project."""
         storage_service = cast(IStorageService, inject.instance(IStorageService))
         project_id = storage_service.project_id
-        if not project_id:
+        if project_id is None:
             communication.warn("Couldn't get project ID from Gitlab, skipping mounting cloudstorage")
+            return
 
         storages = storage_service.list(project_id)