diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
index f08d7afe2c..65b715ce97 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
@@ -639,31 +639,34 @@ using Views
 #line 177 "ErrorPage.cshtml"
                          foreach (var kv in Model.Cookies.OrderBy(kv => kv.Key))
                         {
+                            foreach (var v in kv.Value)
+                            {
 
 #line default
 #line hidden
 
-            WriteLiteral("                            <tr>\r\n                                <td>");
-#line 180 "ErrorPage.cshtml"
-                               Write(kv.Key);
+            WriteLiteral("                                <tr>\r\n                                    <td>");
+#line 182 "ErrorPage.cshtml"
+                                   Write(kv.Key);
 
 #line default
 #line hidden
-            WriteLiteral("</td>\r\n                                <td>");
-#line 181 "ErrorPage.cshtml"
-                               Write(kv.Value);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n                            </tr>\r\n");
+            WriteLiteral("</td>\r\n                                    <td>");
 #line 183 "ErrorPage.cshtml"
+                                   Write(v);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                </tr>\r\n");
+#line 185 "ErrorPage.cshtml"
+                            }
                         }
 
 #line default
 #line hidden
 
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 186 "ErrorPage.cshtml"
+#line 189 "ErrorPage.cshtml"
             }
             else
             {
@@ -672,26 +675,26 @@ using Views
 #line hidden
 
             WriteLiteral("                <p>");
-#line 189 "ErrorPage.cshtml"
+#line 192 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoCookieData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 190 "ErrorPage.cshtml"
+#line 193 "ErrorPage.cshtml"
             }
 
 #line default
 #line hidden
 
             WriteLiteral("        </div>\r\n        <div id=\"headerspage\" class=\"page\">\r\n");
-#line 193 "ErrorPage.cshtml"
+#line 196 "ErrorPage.cshtml"
             
 
 #line default
 #line hidden
 
-#line 193 "ErrorPage.cshtml"
+#line 196 "ErrorPage.cshtml"
              if (Model.Headers.Any())
             {
 
@@ -700,26 +703,26 @@ using Views
 
             WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr" +
 ">\r\n                            <th>");
-#line 198 "ErrorPage.cshtml"
+#line 201 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            <th>");
-#line 199 "ErrorPage.cshtml"
+#line 202 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n             " +
 "       <tbody>\r\n");
-#line 203 "ErrorPage.cshtml"
+#line 206 "ErrorPage.cshtml"
                         
 
 #line default
 #line hidden
 
-#line 203 "ErrorPage.cshtml"
+#line 206 "ErrorPage.cshtml"
                          foreach (var kv in Model.Headers.OrderBy(kv => kv.Key))
                         {
                             foreach (var v in kv.Value)
@@ -729,19 +732,19 @@ using Views
 #line hidden
 
             WriteLiteral("                                <tr>\r\n                                    <td>");
-#line 208 "ErrorPage.cshtml"
+#line 211 "ErrorPage.cshtml"
                                    Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                    <td>");
-#line 209 "ErrorPage.cshtml"
+#line 212 "ErrorPage.cshtml"
                                    Write(v);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 211 "ErrorPage.cshtml"
+#line 214 "ErrorPage.cshtml"
                             }
                         }
 
@@ -749,7 +752,7 @@ using Views
 #line hidden
 
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 215 "ErrorPage.cshtml"
+#line 218 "ErrorPage.cshtml"
             }
             else
             {
@@ -758,13 +761,13 @@ using Views
 #line hidden
 
             WriteLiteral("                <p>");
-#line 218 "ErrorPage.cshtml"
+#line 221 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoHeaderData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 219 "ErrorPage.cshtml"
+#line 222 "ErrorPage.cshtml"
             }
 
 #line default
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
index c332e26830..32755f7f2e 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
@@ -176,10 +176,13 @@
                     <tbody>
                         @foreach (var kv in Model.Cookies.OrderBy(kv => kv.Key))
                         {
-                            <tr>
-                                <td>@kv.Key</td>
-                                <td>@kv.Value</td>
-                            </tr>
+                            foreach (var v in kv.Value)
+                            {
+                                <tr>
+                                    <td>@kv.Key</td>
+                                    <td>@v</td>
+                                </tr>
+                            }
                         }
                     </tbody>
                 </table>