diff --git a/src/panels/config/zha/zha-add-group-page.ts b/src/panels/config/zha/zha-add-group-page.ts
index e5bdd726f0..7daf692795 100644
--- a/src/panels/config/zha/zha-add-group-page.ts
+++ b/src/panels/config/zha/zha-add-group-page.ts
@@ -19,7 +19,7 @@ import {
   addGroup,
   ZHAGroup,
 } from "../../../data/zha";
-import { ZHADevicesDataTable } from "./zha-devices-data-table";
+import "./zha-devices-data-table";
 import { SelectionChangedEvent } from "../../../components/data-table/ha-data-table";
 import { navigate } from "../../../common/navigate";
 import { PolymerChangedEvent } from "../../../polymer-types";
@@ -27,6 +27,8 @@ import "@polymer/paper-spinner/paper-spinner";
 import "@material/mwc-button";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
 import { HASSDomEvent } from "../../../common/dom/fire_event";
+// tslint:disable-next-line: no-duplicate-imports
+import { ZHADevicesDataTable } from "./zha-devices-data-table";
 
 @customElement("zha-add-group-page")
 export class ZHAAddGroupPage extends LitElement {
diff --git a/src/panels/config/zha/zha-group-binding.ts b/src/panels/config/zha/zha-group-binding.ts
index 7217a3c8cc..543735a7fb 100644
--- a/src/panels/config/zha/zha-group-binding.ts
+++ b/src/panels/config/zha/zha-group-binding.ts
@@ -27,13 +27,15 @@ import {
   Cluster,
   fetchClustersForZhaNode,
 } from "../../../data/zha";
-import { ZHAClustersDataTable } from "./zha-clusters-data-table";
+import "./zha-clusters-data-table";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import { ItemSelectedEvent } from "./types";
 import "@polymer/paper-item/paper-item";
 import { SelectionChangedEvent } from "../../../components/data-table/ha-data-table";
 import { HASSDomEvent } from "../../../common/dom/fire_event";
+// tslint:disable-next-line: no-duplicate-imports
+import { ZHAClustersDataTable } from "./zha-clusters-data-table";
 
 @customElement("zha-group-binding-control")
 export class ZHAGroupBindingControl extends LitElement {
@@ -48,7 +50,7 @@ export class ZHAGroupBindingControl extends LitElement {
   @property() private _clusters: Cluster[] = [];
   private _groupToBind?: ZHAGroup;
   private _clustersToBind?: Cluster[];
-  @query("zha-devices-data-table")
+  @query("zha-clusters-data-table")
   private _zhaClustersDataTable!: ZHAClustersDataTable;
 
   protected updated(changedProperties: PropertyValues): void {