diff --git a/src/MusicStore/Components/CartSummaryComponent.cs b/src/MusicStore/Components/CartSummaryComponent.cs
index f467409722..eccc439aee 100644
--- a/src/MusicStore/Components/CartSummaryComponent.cs
+++ b/src/MusicStore/Components/CartSummaryComponent.cs
@@ -19,9 +19,8 @@ namespace MusicStore.Components
                 .Select(a => a.Album.Title)
                 .OrderBy(x => x);
 
-            //Bug: Start using ViewBag when that's available in a ViewComponent
-            ViewData.Add("CartCount", cartItems.Count());
-            ViewData.Add("CartSummary", string.Join("\n", cartItems.Distinct()));
+            ViewBag.CartCount = cartItems.Count();
+            ViewBag.CartSummary = string.Join("\n", cartItems.Distinct());
 
             return View();
         }
diff --git a/src/MusicStore/Views/Shared/Components/CartSummary/Default.cshtml b/src/MusicStore/Views/Shared/Components/CartSummary/Default.cshtml
index 22ef700292..50d6dbd769 100644
--- a/src/MusicStore/Views/Shared/Components/CartSummary/Default.cshtml
+++ b/src/MusicStore/Views/Shared/Components/CartSummary/Default.cshtml
@@ -1,9 +1,9 @@
-@if ((int)ViewData["CartCount"] > 0)
+@if (ViewBag.CartCount > 0)
 {
     <li>
-        <a href="@Url.Action("Index", "ShoppingCart")" title="@ViewData["CartSummary"]">
+        <a href="@Url.Action("Index", "ShoppingCart")" title="@ViewBag.CartSummary">
             <span class="glyphicon glyphicon glyphicon-shopping-cart"></span>
-            @ViewData["CartCount"]
+            @ViewBag.CartCount
         </a>
     </li>
 }
\ No newline at end of file