diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
index e968b1d6de..6d22aa5f27 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
@@ -126,9 +126,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             if (razorHtmlObj == null)
             {
                 var razorHtmlDocument = RazorHtmlWriter.GetHtmlDocument(document);
-                document.Items[typeof(RazorHtmlDocument)] = razorHtmlDocument;
-
-                return razorHtmlDocument;
+                if (razorHtmlDocument != null)
+                {
+                    document.Items[typeof(RazorHtmlDocument)] = razorHtmlDocument;
+                    return razorHtmlDocument;
+                }
             }
 
             return (RazorHtmlDocument)razorHtmlObj;