diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 61e6ca3e..cce610c7 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -168,7 +168,11 @@ function print(path, options, print) {
       );
     }
     case "AttrNode": {
-      const quote = n.value.type === "TextNode" ? '"' : "";
+      const isText = n.value.type === "TextNode";
+      if (isText && n.value.chars === "") {
+        return concat([n.name]);
+      }
+      const quote = isText ? '"' : "";
       return concat([n.name, "=", quote, path.call(print, "value"), quote]);
     }
     case "ConcatStatement": {
diff --git a/tests/html_glimmer/__snapshots__/jsfmt.spec.js.snap b/tests/html_glimmer/__snapshots__/jsfmt.spec.js.snap
index 9423c13d..ab84adb8 100644
--- a/tests/html_glimmer/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_glimmer/__snapshots__/jsfmt.spec.js.snap
@@ -139,6 +139,12 @@ exports[`component.hbs - glimmer-verify 1`] = `
 {{@greeting}}, {{@name}}!
 
 <button onclick={{action next}}>Next</button>
+
+<button disabled class="disabled"></button>
+
+<button disabled=disabled class="disabled"></button>
+
+<div ...attributes>Hello</div>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <user-greeting @name="Ricardo" @greeting="Olá"></user-greeting>
 {{@greeting}}
@@ -148,6 +154,11 @@ exports[`component.hbs - glimmer-verify 1`] = `
 <button onclick={{action next}}>
   Next
 </button>
+<button disabled class="disabled"></button>
+<button disabled="disabled" class="disabled"></button>
+<div ...attributes>
+  Hello
+</div>
 `;
 
 exports[`concat-statement.hbs - glimmer-verify 1`] = `
diff --git a/tests/html_glimmer/component.hbs b/tests/html_glimmer/component.hbs
index 2426214a..69cd3d2d 100644
--- a/tests/html_glimmer/component.hbs
+++ b/tests/html_glimmer/component.hbs
@@ -2,3 +2,9 @@
 {{@greeting}}, {{@name}}!
 
 <button onclick={{action next}}>Next</button>
+
+<button disabled class="disabled"></button>
+
+<button disabled=disabled class="disabled"></button>
+
+<div ...attributes>Hello</div>