diff --git a/apps/orgs/utils.py b/apps/orgs/utils.py
index c69af25b8..d5ea4ca30 100644
--- a/apps/orgs/utils.py
+++ b/apps/orgs/utils.py
@@ -11,10 +11,9 @@ from .models import Organization
 
 
 def get_org_from_request(request):
-    oid = request.session.get("oid")
+    oid = request.META.get("HTTP_X_JMS_ORG")
     if not oid:
-        oid = request.META.get("HTTP_X_JMS_ORG")
-
+        oid = request.session.get("oid")
     request_params_oid = request.GET.get("oid")
     if request_params_oid:
         oid = request.GET.get("oid")