diff --git a/src/Resources/Controllers/ResourceController.cs b/src/Resources/Controllers/ResourceController.cs
index d5ea006b77bccc80f272d46c5085cfe88b52faae..c41f704e413c9e1108357dc3533cea8355ef43fb 100644
--- a/src/Resources/Controllers/ResourceController.cs
+++ b/src/Resources/Controllers/ResourceController.cs
@@ -304,6 +304,11 @@ namespace Coscine.Api.Resources.Controllers
             if (projectModel.HasAccess(user, project, UserRoles.Owner, UserRoles.Member))
             {
                 var orgs = Util.OrganizationsHelper.GetOrganization(user);
+                
+                if (orgs?.Any() != true)
+                {
+                    orgs = new List<string> { "*" };
+                }
 
                 if (!resourceType.Enabled.HasValue
                     || !resourceType.Enabled.Value
diff --git a/src/Resources/Controllers/ResourceTypeController.cs b/src/Resources/Controllers/ResourceTypeController.cs
index 4df5b836aece635a4e14d869e5f9daec0a05e980..67b6f849e5e9bb5b41a5c4af1261daa792558bf4 100644
--- a/src/Resources/Controllers/ResourceTypeController.cs
+++ b/src/Resources/Controllers/ResourceTypeController.cs
@@ -43,6 +43,11 @@ namespace Coscine.Api.Resources.Controllers
 
             var orgs = Util.OrganizationsHelper.GetOrganization(user);
 
+            if (orgs?.Any() != true)
+            {
+                orgs = new List<string> { "*" };
+            }
+
             var listOfResources = orgs.SelectMany(x => ResourceTypeFactory
                 .Instance
                 .GetSpecificResourceTypes(x)
@@ -63,6 +68,11 @@ namespace Coscine.Api.Resources.Controllers
 
             var orgs = Util.OrganizationsHelper.GetOrganization(user).ToList();
 
+            if (orgs?.Any() != true)
+            {
+                orgs = new List<string> { "*" };
+            }
+
             var listOfActiveResources = orgs.SelectMany(x => ResourceTypeFactory
                 .Instance
                 .GetSpecificResourceTypes(x, ResourceTypes.Base.ResourceTypeStatus.Active)