diff --git a/src/WebRazorPages/Constants.cs b/src/WebRazorPages/Constants.cs
index 045f32c..c2e0e53 100644
--- a/src/WebRazorPages/Constants.cs
+++ b/src/WebRazorPages/Constants.cs
@@ -4,5 +4,6 @@
     {
         public const string BASKET_COOKIENAME = "eShop";
         public const int ITEMS_PER_PAGE = 10;
+        public const string DEFAULT_USERNAME = "Guest";
     }
 }
diff --git a/src/WebRazorPages/ViewComponents/Basket.cs b/src/WebRazorPages/ViewComponents/Basket.cs
index 1b1b4d3..02828f4 100644
--- a/src/WebRazorPages/ViewComponents/Basket.cs
+++ b/src/WebRazorPages/ViewComponents/Basket.cs
@@ -38,7 +38,7 @@ namespace Microsoft.eShopWeb.RazorPages.ViewComponents
             {
                 return User.Identity.Name;
             }
-            return GetBasketIdFromCookie();
+            return GetBasketIdFromCookie() ?? Constants.DEFAULT_USERNAME;
         }
 
         private string GetBasketIdFromCookie()