diff --git a/src/Actions/RenderAdminNotice.php b/src/Actions/RenderAdminNotice.php
index ee7ce4c..d2d4d8e 100644
--- a/src/Actions/RenderAdminNotice.php
+++ b/src/Actions/RenderAdminNotice.php
@@ -38,10 +38,6 @@ public function __invoke(AdminNotice $notice): string
             $content = $renderTextOrCallback;
         }
 
-        if (!$notice->isCustom() && $notice->shouldAutoParagraph()) {
-            $content = wpautop($content);
-        }
-
         if ($notice->isCustom()) {
             return $this->applyCustomAttributesToContent($content, $notice);
         }
@@ -49,7 +45,7 @@ public function __invoke(AdminNotice $notice): string
         return sprintf(
             "<div class='%s' $elementProperties->idAttribute>%s</div>",
             esc_attr($this->getStandardWrapperClasses($notice)),
-            $content
+            $notice->shouldAutoParagraph() ? wpautop($content) : $content
         );
     }