diff --git a/src/panels/lovelace/common/create-row-element.ts b/src/panels/lovelace/common/create-row-element.ts
index 8afa9aefc8..9f0aa654f8 100644
--- a/src/panels/lovelace/common/create-row-element.ts
+++ b/src/panels/lovelace/common/create-row-element.ts
@@ -52,6 +52,9 @@ const DOMAIN_TO_ELEMENT_TYPE = {
   timer: "timer",
   switch: "toggle",
   vacuum: "toggle",
+  // Temporary. Once climate is rewritten,
+  // water heater should get it's own row.
+  water_heater: "climate",
 };
 const TIMEOUT = 2000;