diff --git a/src/components/ha-formfield.ts b/src/components/ha-formfield.ts
index 211ee8d0b0..6d0a5b8ba0 100644
--- a/src/components/ha-formfield.ts
+++ b/src/components/ha-formfield.ts
@@ -14,7 +14,7 @@ export class HaFormfield extends MwcFormfield {
     return [
       style,
       css`
-        ::slotted(ha-switch) {
+        :host(:not([alignEnd])) ::slotted(ha-switch) {
           margin-right: 10px;
         }
         :host([dir="rtl"]:not([alignEnd])) ::slotted(ha-switch) {