diff --git a/awx/main/middleware.py b/awx/main/middleware.py
index 43074814c6..15bbf3aa15 100644
--- a/awx/main/middleware.py
+++ b/awx/main/middleware.py
@@ -126,10 +126,10 @@ class SessionTimeoutMiddleware(object):
     """
 
     def process_response(self, request, response):
-        
-        if request.session:
-            request.session.set_expiry(request.session.get_expiry_age())
-            response['Session-Timeout'] = int(settings.SESSION_COOKIE_AGE)
+        req_session = getattr(request, 'session', None)
+        if req_session and not req_session.is_empty():
+                request.session.set_expiry(request.session.get_expiry_age())
+                response['Session-Timeout'] = int(settings.SESSION_COOKIE_AGE)
         return response