diff --git a/organizations/middleware.py b/organizations/middleware.py
index 0c5eee79..e04e9ed6 100644
--- a/organizations/middleware.py
+++ b/organizations/middleware.py
@@ -13,7 +13,11 @@ def get_organization(request):
         """
         Returns the value of the `ORGANIZATION` HTTP header
         """
-        return request.META.get("HTTP_ORGANIZATION", get_public_schema_name())
+        org = request.META.get("HTTP_ORGANIZATION", get_public_schema_name())
+        if not org:
+            return get_public_schema_name()
+
+        return org
 
     def get_tenant(self, tenant_model, request):
         """
diff --git a/plio/views.py b/plio/views.py
index f63d80ae..43e09789 100644
--- a/plio/views.py
+++ b/plio/views.py
@@ -2,6 +2,7 @@
 from rest_framework.response import Response
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
+from django_tenants.utils import get_public_schema_name
 from django.db.models import Count, Q
 from plio.models import Video, Plio, Item, Question
 from organizations.middleware import OrganizationTenantMiddleware
@@ -53,7 +54,7 @@ def get_queryset(self):
         )
 
         # personal workspace
-        if organization_shortcode == "":
+        if organization_shortcode == get_public_schema_name():
             return Plio.objects.filter(created_by=self.request.user)
 
         # organizational workspace