diff --git a/packages/autofmt/src/component.rs b/packages/autofmt/src/component.rs
index 0b703c529..036d0dd17 100644
--- a/packages/autofmt/src/component.rs
+++ b/packages/autofmt/src/component.rs
@@ -61,7 +61,7 @@ impl Buffer {
         }
 
         // If there's nothing at all, empty optimization
-        if fields.is_empty() && children.is_empty() {
+        if fields.is_empty() && children.is_empty() && manual_props.is_none() {
             opt_level = ShortOptimization::Empty;
         }
 
diff --git a/packages/autofmt/tests/samples/simple.rsx b/packages/autofmt/tests/samples/simple.rsx
index f34ac5a96..62a70cfaf 100644
--- a/packages/autofmt/tests/samples/simple.rsx
+++ b/packages/autofmt/tests/samples/simple.rsx
@@ -31,4 +31,7 @@ rsx! {
 
     // One level compression
     div { a { class: "py-2 px-3 bg-indigo-500 hover:bg-indigo-600 rounded text-xs text-white", href: "#", "Send invitation" } }
+
+    // Components
+    Component { ..Props {} }
 }
diff --git a/packages/autofmt/tests/wrong.rs b/packages/autofmt/tests/wrong.rs
index f15849573..4cf339e59 100644
--- a/packages/autofmt/tests/wrong.rs
+++ b/packages/autofmt/tests/wrong.rs
@@ -12,3 +12,19 @@ macro_rules! twoway {
 }
 
 twoway!("comments" => comments);
+
+// rsx! {
+//     div { class: "asdasd", "hello world" }
+//     h1 {
+//         // Important handler
+//         onclick: move |_| {
+//             let a = 10;
+//         },
+
+//         div { "hello" }
+
+//         // Important handler
+//         "Goodbye world"
+//     }
+//     Component {}
+// }