diff --git a/src/Sulu/Bundle/SecurityBundle/Resources/config/services.xml b/src/Sulu/Bundle/SecurityBundle/Resources/config/services.xml
index ac3a0136d9c..c05f1168aa9 100644
--- a/src/Sulu/Bundle/SecurityBundle/Resources/config/services.xml
+++ b/src/Sulu/Bundle/SecurityBundle/Resources/config/services.xml
@@ -54,7 +54,8 @@
 
         <service id="sulu_security.authentication_handler" class="%sulu_security.authentication_handler.class%">
             <argument type="service" id="router"/>
-            <argument type="service" id="session" on-invalid="null"/>
+            <argument type="service" id="session"/>
+            <tag name="sulu.context" context="admin"/>
         </service>
 
         <service id="sulu_security.mask_converter" class="%sulu_security.mask_converter.class%">