diff --git a/Services/UserService.cs b/Services/UserService.cs
index adee90d..ede7312 100644
--- a/Services/UserService.cs
+++ b/Services/UserService.cs
@@ -24,8 +24,12 @@ namespace QRRapidoApp.Services
             try
             {
                 if (_context.Users == null) return null; // Development mode without MongoDB
-
-                var userData = await _context.Users.Find(u => u.Id == userId).FirstOrDefaultAsync();
+                User? userData = null;
+                
+                if (!String.IsNullOrEmpty(userId))
+                {
+                    userData = await _context.Users.Find(u => u.Id == userId).FirstOrDefaultAsync();
+                }
 
                 return userData ?? new User();
             }