diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 1fb63efb499..ea2a21c4dc6 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -9,9 +9,17 @@ const (
 )
 
 func GetUserFromRequestContext(r *http.Request) *User {
-	user, ok := r.Context().Value(UserContextKey).(*User)
-	if !ok {
+	if r == nil {
 		return nil
 	}
-	return user
+
+	userValue := r.Context().Value(UserContextKey)
+	if userValue == nil {
+		return nil
+	}
+
+	if user, ok := userValue.(*User); ok {
+		return user
+	}
+	return nil
 }