diff --git a/src/components/scene-components.js b/src/components/scene-components.js
index 9e107cf26b..caa8b9de33 100644
--- a/src/components/scene-components.js
+++ b/src/components/scene-components.js
@@ -2,6 +2,7 @@ import "./animation";
 import "./ambient-light";
 import "./animation-mixer";
 import "./audio-feedback";
+import "./billboard";
 import "./css-class";
 import "./directional-light";
 import "./duck";
diff --git a/src/gltf-component-mappings.js b/src/gltf-component-mappings.js
index a59961b506..1900ac926a 100644
--- a/src/gltf-component-mappings.js
+++ b/src/gltf-component-mappings.js
@@ -70,7 +70,7 @@ AFRAME.GLTFModelPlus.registerComponent("directional-light", "directional-light")
 AFRAME.GLTFModelPlus.registerComponent("hemisphere-light", "hemisphere-light");
 AFRAME.GLTFModelPlus.registerComponent("point-light", "point-light");
 AFRAME.GLTFModelPlus.registerComponent("spot-light", "spot-light");
-
+AFRAME.GLTFModelPlus.registerComponent("billboard", "billboard");
 AFRAME.GLTFModelPlus.registerComponent("simple-water", "simple-water");
 AFRAME.GLTFModelPlus.registerComponent("skybox", "skybox");
 AFRAME.GLTFModelPlus.registerComponent("layers", "layers");
diff --git a/src/hub.js b/src/hub.js
index 89a06bf868..5212ec720a 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -109,7 +109,6 @@ import "./components/replay";
 import "./components/visibility-by-path";
 import "./components/tags";
 import "./components/hubs-text";
-import "./components/billboard";
 import "./components/periodic-full-syncs";
 import "./components/inspect-button";
 import "./components/inspect-pivot-child-selector";