diff --git a/muppet/puppet/ast.py b/muppet/puppet/ast.py
index 63127b94b7d14bdd5c8c552c886b3a1f6c109159..af2ccb152003c221d55012f9b31231b2f6e85a42 100644
--- a/muppet/puppet/ast.py
+++ b/muppet/puppet/ast.py
@@ -231,7 +231,7 @@ class PuppetExportedQuery(Puppet):
     """
     An exported query.
 
-    .. highlight:: puppet
+    .. code-block:: puppet
 
         <<| filter |>>
     """
@@ -244,7 +244,7 @@ class PuppetVirtualQuery(Puppet):
     """
     A virtual query.
 
-    .. highlight:: puppet
+    .. code-block:: puppet
 
         <| q |>
     """
diff --git a/muppet/puppet/format/text.py b/muppet/puppet/format/text.py
index 9d89042ea44ee0e207e57d573028a26beda84687..2ac3aaab5f447413b032077ed43fddc728b5196c 100644
--- a/muppet/puppet/format/text.py
+++ b/muppet/puppet/format/text.py
@@ -62,7 +62,11 @@ def find_heredoc_delimiter(
 
     Heredoc's are delimited like
 
-    .. code-block:: puppet
+    .. Syntax highlighting disabled since the puppet highlighter
+       fails on the '@' sign, causing a warning in the build log (and
+       highlighting the '@' as an error in the output)
+
+    .. code-block::
 
         @(EOF)
           Some text