diff --git a/common/framework/Template.php b/common/framework/Template.php
index d7b164f2a..387c3ba6a 100644
--- a/common/framework/Template.php
+++ b/common/framework/Template.php
@@ -865,7 +865,14 @@ class Template
 			}
 		}
 
-		return sprintf(' %s="%s"', $attribute, escape(implode($delimiters[$attribute], $values), false));
+		if (count($values))
+		{
+			return sprintf(' %s="%s"', $attribute, escape(implode($delimiters[$attribute], $values), false));
+		}
+		else
+		{
+			return '';
+		}
 	}
 
 	/**
diff --git a/tests/_data/template/v2example.compiled.html b/tests/_data/template/v2example.compiled.html
index 1c9dce8a3..280f116af 100644
--- a/tests/_data/template/v2example.compiled.html
+++ b/tests/_data/template/v2example.compiled.html
@@ -58,6 +58,8 @@
 		'margin: 1rem' => Context::get('bar'),
 		'padding: 2rem' => false,
 	]); ?>></span>
+	<span<?php echo $this->_v2_buildAttribute('class', ['a' => false, 'b' => false]); ?>></span>
+	<span<?php echo $this->_v2_buildAttribute('style', ['a' => false, 'b' => false]); ?>></span>
 </div>
 
 <script type="text/javascript"<?php $this->config->context = 'JS'; ?>>
diff --git a/tests/_data/template/v2example.executed.html b/tests/_data/template/v2example.executed.html
index 3224403f0..063b7ac16 100644
--- a/tests/_data/template/v2example.executed.html
+++ b/tests/_data/template/v2example.executed.html
@@ -54,6 +54,8 @@
 <div class="barContainer" data-bar="[&quot;Rhy&quot;,&quot;miX&quot;,&quot;is&quot;,&quot;da&quot;,&quot;BEST!&quot;]">
 	<span class="a-1 font-normal bg-gray-200"></span>
 	<span style="border-radius: 0.25rem; margin: 1rem"></span>
+	<span></span>
+	<span></span>
 </div>
 
 <script type="text/javascript">
diff --git a/tests/_data/template/v2example.html b/tests/_data/template/v2example.html
index 8335308bf..7ff552d2a 100644
--- a/tests/_data/template/v2example.html
+++ b/tests/_data/template/v2example.html
@@ -58,6 +58,8 @@
 		'margin: 1rem' => Context::get('bar'),
 		'padding: 2rem' => false,
 	])></span>
+	<span @class(['a' => false, 'b' => false])></span>
+	<span @style(['a' => false, 'b' => false])></span>
 </div>
 
 <script type="text/javascript">