diff --git a/ayon_api/server_api.py b/ayon_api/server_api.py
index ac7f8d2a3..c0dc0054f 100644
--- a/ayon_api/server_api.py
+++ b/ayon_api/server_api.py
@@ -859,12 +859,12 @@ def as_username(self, username):
                 "Can't set service username. API key is not a service token."
             )
 
-        with self._as_user_stack.as_user(username) as o:
-            self._update_session_headers()
-            try:
-                yield o
-            finally:
+        try:
+            with self._as_user_stack.as_user(username) as o:
                 self._update_session_headers()
+                yield o
+        finally:
+            self._update_session_headers()
 
     @property
     def is_server_available(self):