diff --git a/discovery/rest/internal/documents/compose.go b/discovery/rest/internal/documents/compose.go
index 0ba3400a1..ee4cd9c1f 100644
--- a/discovery/rest/internal/documents/compose.go
+++ b/discovery/rest/internal/documents/compose.go
@@ -476,7 +476,7 @@ func (d composeResources) getUserInfo(ctx context.Context, ID uint64, users map[
 		return &user, users, nil
 	} else {
 		u, err := d.usr.FindByID(ctx, ID)
-		if err != nil {
+		if err != nil && u != nil {
 			users[ID] = *u
 		}
 		return u, users, err