diff --git a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/PlaceholderTagHelper.cs b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/PlaceholderTagHelper.cs
index 641c5c9..a83d6cb 100644
--- a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/PlaceholderTagHelper.cs
+++ b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/PlaceholderTagHelper.cs
@@ -70,7 +70,8 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
             return;
         }
 
-        if (IsInEditingMode(renderingContext) && IsPlaceHolderEmpty(placeholderFeatures))
+        bool emptyEdit = IsInEditingMode(renderingContext) && IsPlaceHolderEmpty(placeholderFeatures);
+        if (emptyEdit)
         {
             output.Content.AppendHtml("<div class=\"sc-empty-placeholder\">");
         }
@@ -102,7 +103,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
             output.Content.AppendHtml(html);
         }
 
-        if (IsInEditingMode(renderingContext) && IsPlaceHolderEmpty(placeholderFeatures))
+        if (emptyEdit)
         {
             output.Content.AppendHtml("</div>");
         }
@@ -115,7 +116,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
 
     private static bool IsInEditingMode(ISitecoreRenderingContext renderingContext)
     {
-        return renderingContext?.Response?.Content?.Sitecore?.Context?.IsEditing ?? false;
+        return renderingContext.Response?.Content?.Sitecore?.Context?.IsEditing ?? false;
     }
 
     private static bool IsPlaceHolderEmpty(Placeholder placeholderFeatures)