diff --git a/backend/LexBoxApi/Auth/LoggedInContext.cs b/backend/LexBoxApi/Auth/LoggedInContext.cs
index e04a557d7..fb1461fd5 100644
--- a/backend/LexBoxApi/Auth/LoggedInContext.cs
+++ b/backend/LexBoxApi/Auth/LoggedInContext.cs
@@ -2,7 +2,7 @@
 
 namespace LexBoxApi.Auth;
 
-public class LoggedInContext
+public class LoggedInContext : IDisposable
 {
     private readonly Lazy<LexAuthUser> _user;
 
@@ -21,5 +21,16 @@ public LoggedInContext(IHttpContextAccessor httpContextAccessor)
     /// <summary>
     /// get the logged in user, will throw an exception if the user is not logged in
     /// </summary>
-    public LexAuthUser User => _user.Value;
-}
\ No newline at end of file
+    public LexAuthUser User =>
+        _disposed
+            ? throw new ObjectDisposedException(nameof(LoggedInContext),
+                "this context has been disposed because the request that created it has finished")
+            : _user.Value;
+
+    private bool _disposed;
+
+    public void Dispose()
+    {
+        _disposed = true;
+    }
+}
diff --git a/backend/LexBoxApi/GraphQL/GraphQlSetupKernel.cs b/backend/LexBoxApi/GraphQL/GraphQlSetupKernel.cs
index e74161240..e6983b17a 100644
--- a/backend/LexBoxApi/GraphQL/GraphQlSetupKernel.cs
+++ b/backend/LexBoxApi/GraphQL/GraphQlSetupKernel.cs
@@ -1,5 +1,6 @@
 using HotChocolate.Data.Projections.Expressions;
 using HotChocolate.Diagnostics;
+using LexBoxApi.Auth;
 using LexBoxApi.Config;
 using LexCore.ServiceInterfaces;
 using LexData;
@@ -17,6 +18,7 @@ public static void AddLexGraphQL(this IServiceCollection services, IWebHostEnvir
             .InitializeOnStartup()
             .RegisterDbContext<LexBoxDbContext>()
             .RegisterService<IHgService>()
+            .RegisterService<LoggedInContext>()
             .AddSorting(descriptor =>
             {
                 descriptor.AddDefaults();
diff --git a/backend/LexBoxApi/GraphQL/LexQueries.cs b/backend/LexBoxApi/GraphQL/LexQueries.cs
index d22446ca5..f9b4e623e 100644
--- a/backend/LexBoxApi/GraphQL/LexQueries.cs
+++ b/backend/LexBoxApi/GraphQL/LexQueries.cs
@@ -10,18 +10,12 @@ namespace LexBoxApi.GraphQL;
 [QueryType]
 public class LexQueries
 {
-    private readonly LoggedInContext _loggedInContext;
-
-    public LexQueries(LoggedInContext loggedInContext)
-    {
-        _loggedInContext = loggedInContext;
-    }
 
     [UseProjection]
     [UseSorting]
-    public IQueryable<Project> MyProjects(LexBoxDbContext context)
+    public IQueryable<Project> MyProjects(LoggedInContext loggedInContext, LexBoxDbContext context)
     {
-        var projectCodes = _loggedInContext.User.Projects.Select(p => p.Code);
+        var projectCodes = loggedInContext.User.Projects.Select(p => p.Code);
         return context.Projects.Where(p => projectCodes.Contains(p.Code));
     }
 
@@ -50,8 +44,8 @@ public IQueryable<User> Users(LexBoxDbContext context)
         return context.Users;
     }
 
-    public LexAuthUser Me()
+    public LexAuthUser Me(LoggedInContext loggedInContext)
     {
-        return _loggedInContext.User;
+        return loggedInContext.User;
     }
 }