diff --git a/changelog/unreleased/fix-userlog-panic.md b/changelog/unreleased/fix-userlog-panic.md
new file mode 100644
index 0000000000..f8ea47b4d2
--- /dev/null
+++ b/changelog/unreleased/fix-userlog-panic.md
@@ -0,0 +1,5 @@
+Bugfix: Fix userlog panic
+
+userlog services paniced because of `nil` ctx. That is fixed now
+
+https://github.com/owncloud/ocis/pull/6114
diff --git a/services/userlog/pkg/service/service.go b/services/userlog/pkg/service/service.go
index deda66be72..8429919a49 100644
--- a/services/userlog/pkg/service/service.go
+++ b/services/userlog/pkg/service/service.go
@@ -352,6 +352,10 @@ func (ul *UserlogService) resolveID(ctx context.Context, userid *user.UserId, gr
 		return []string{userid.GetOpaqueId()}, nil
 	}
 
+	if ctx == nil {
+		return nil, errors.New("need ctx to resolve group id")
+	}
+
 	return ul.resolveGroup(ctx, groupid.GetOpaqueId())
 }