diff --git a/addon/components/model-select-multiple.hbs b/addon/components/model-select-multiple.hbs
index 2b60921..e32a371 100644
--- a/addon/components/model-select-multiple.hbs
+++ b/addon/components/model-select-multiple.hbs
@@ -73,7 +73,12 @@
   @eventType={{@eventType}}
   @title={{@title}}
   {{!-- @triggerClass="ember-power-select-multiple-trigger {{@triggerClass}}" --}}
-  @triggerComponent={{component (or @triggerComponent "power-select-multiple/trigger") tabindex=@tabindex}}
+  @triggerComponent={{
+    if
+      @triggerComponent
+      (component (ensure-safe-component @triggerComponent) tabindex=@tabindex)
+      (component "power-select-multiple/trigger" tabindex=@tabindex)
+  }}
   @triggerId={{@triggerId}}
   @verticalPosition={{@verticalPosition}}
   @tabindex={{this.computedTabIndex}}
diff --git a/addon/components/model-select.hbs b/addon/components/model-select.hbs
index a8f5f27..5e60c64 100644
--- a/addon/components/model-select.hbs
+++ b/addon/components/model-select.hbs
@@ -34,7 +34,7 @@
     @onOpen={{this.onOpen}}
     @options={{this._options}}
     @optionsComponent={{component
-      this.optionsComponent
+      (ensure-safe-component this.optionsComponent)
       infiniteScroll=this.infiniteScroll
       infiniteModel=this.model
       withCreate=this.withCreate}}
@@ -52,7 +52,7 @@
     @selectedItemComponent={{@selectedItemComponent}}
     @tabindex={{@tabindex}}
     @triggerClass={{@triggerClass}}
-    @triggerComponent={{@triggerComponent}}
+    @triggerComponent={{ensure-safe-component @triggerComponent}}
     @triggerId={{@triggerId}}
     @triggerRole={{@triggerRole}}
     @typeAheadMatcher={{@typeAheadMatcher}}
diff --git a/package.json b/package.json
index ad8acb7..9ac2b57 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "prepare": "node ./compile-css.js"
   },
   "dependencies": {
+    "@embroider/util": "^1.12.1",
     "@ember/test-waiters": "^2.4.5",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9060087..70fb1a9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,6 +12,9 @@ dependencies:
   '@ember/test-waiters':
     specifier: ^2.4.5
     version: 2.4.5
+  '@embroider/util':
+    specifier: 1.12.1
+    version: 1.12.1(ember-source@4.12.3)
   '@glimmer/component':
     specifier: ^1.1.2
     version: 1.1.2(@babel/core@7.23.7)