diff --git a/apps/jumpserver/middleware.py b/apps/jumpserver/middleware.py
index a99c2e6e5..f2ea1f077 100644
--- a/apps/jumpserver/middleware.py
+++ b/apps/jumpserver/middleware.py
@@ -56,4 +56,6 @@ class RequestMiddleware:
     def __call__(self, request):
         set_current_request(request)
         response = self.get_response(request)
+        age = request.session.get_expiry_age()
+        request.session.set_expiry(age)
         return response
diff --git a/apps/orgs/middleware.py b/apps/orgs/middleware.py
index cda25bedc..24a2b99fe 100644
--- a/apps/orgs/middleware.py
+++ b/apps/orgs/middleware.py
@@ -25,7 +25,8 @@ class OrgMiddleware:
     def __call__(self, request):
         self.set_permed_org_if_need(request)
         org = get_org_from_request(request)
-        request.current_org = org
-        set_current_org(org)
+        if org is not None:
+            request.current_org = org
+            set_current_org(org)
         response = self.get_response(request)
         return response