diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
index e5fc8cc323..555ae89965 100644
--- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
@@ -670,34 +670,31 @@ WriteAttributeValue("", 5155, frame.Line + 1, 5155, 17, false);
 #line 187 "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 192 "ErrorPage.cshtml"
-                                   Write(kv.Key);
+            WriteLiteral("                            <tr>\r\n                                <td>");
+#line 190 "ErrorPage.cshtml"
+                               Write(kv.Key);
 
 #line default
 #line hidden
-            WriteLiteral("</td>\r\n                                    <td>");
+            WriteLiteral("</td>\r\n                                <td>");
+#line 191 "ErrorPage.cshtml"
+                               Write(kv.Value);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                            </tr>\r\n");
 #line 193 "ErrorPage.cshtml"
-                                   Write(v);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 195 "ErrorPage.cshtml"
-                            }
                         }
 
 #line default
 #line hidden
 
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 199 "ErrorPage.cshtml"
+#line 196 "ErrorPage.cshtml"
             }
             else
             {
@@ -706,26 +703,26 @@ WriteAttributeValue("", 5155, frame.Line + 1, 5155, 17, false);
 #line hidden
 
             WriteLiteral("                <p>");
-#line 202 "ErrorPage.cshtml"
+#line 199 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoCookieData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 203 "ErrorPage.cshtml"
+#line 200 "ErrorPage.cshtml"
             }
 
 #line default
 #line hidden
 
             WriteLiteral("        </div>\r\n        <div id=\"headerspage\" class=\"page\">\r\n");
-#line 206 "ErrorPage.cshtml"
+#line 203 "ErrorPage.cshtml"
             
 
 #line default
 #line hidden
 
-#line 206 "ErrorPage.cshtml"
+#line 203 "ErrorPage.cshtml"
              if (Model.Headers.Any())
             {
 
@@ -733,25 +730,25 @@ WriteAttributeValue("", 5155, frame.Line + 1, 5155, 17, false);
 #line hidden
 
             WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
-#line 211 "ErrorPage.cshtml"
+#line 208 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            <th>");
-#line 212 "ErrorPage.cshtml"
+#line 209 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n");
-#line 216 "ErrorPage.cshtml"
+#line 213 "ErrorPage.cshtml"
                         
 
 #line default
 #line hidden
 
-#line 216 "ErrorPage.cshtml"
+#line 213 "ErrorPage.cshtml"
                          foreach (var kv in Model.Headers.OrderBy(kv => kv.Key))
                         {
                             foreach (var v in kv.Value)
@@ -761,19 +758,19 @@ WriteAttributeValue("", 5155, frame.Line + 1, 5155, 17, false);
 #line hidden
 
             WriteLiteral("                                <tr>\r\n                                    <td>");
-#line 221 "ErrorPage.cshtml"
+#line 218 "ErrorPage.cshtml"
                                    Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                    <td>");
-#line 222 "ErrorPage.cshtml"
+#line 219 "ErrorPage.cshtml"
                                    Write(v);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 224 "ErrorPage.cshtml"
+#line 221 "ErrorPage.cshtml"
                             }
                         }
 
@@ -781,7 +778,7 @@ WriteAttributeValue("", 5155, frame.Line + 1, 5155, 17, false);
 #line hidden
 
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 228 "ErrorPage.cshtml"
+#line 225 "ErrorPage.cshtml"
             }
             else
             {
@@ -790,13 +787,13 @@ WriteAttributeValue("", 5155, frame.Line + 1, 5155, 17, false);
 #line hidden
 
             WriteLiteral("                <p>");
-#line 231 "ErrorPage.cshtml"
+#line 228 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoHeaderData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 232 "ErrorPage.cshtml"
+#line 229 "ErrorPage.cshtml"
             }
 
 #line default
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
index bec02dcc20..a43a95f806 100644
--- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
+++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
@@ -186,13 +186,10 @@
                     <tbody>
                         @foreach (var kv in Model.Cookies.OrderBy(kv => kv.Key))
                         {
-                            foreach (var v in kv.Value)
-                            {
-                                <tr>
-                                    <td>@kv.Key</td>
-                                    <td>@v</td>
-                                </tr>
-                            }
+                            <tr>
+                                <td>@kv.Key</td>
+                                <td>@kv.Value</td>
+                            </tr>
                         }
                     </tbody>
                 </table>