diff --git a/addon/components/-internals/contextual-container/element/component.ts b/addon/components/-internals/contextual-container/element/component.ts
index f473214..34f89d8 100644
--- a/addon/components/-internals/contextual-container/element/component.ts
+++ b/addon/components/-internals/contextual-container/element/component.ts
@@ -3,7 +3,7 @@ import Component from '@ember/component';
 import { layout, tagName } from '@ember-decorators/component';
 import { reads } from '@ember/object/computed';
 import { computed, set } from '@ember/object';
-import { htmlSafe } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 import hide from '@popperjs/core/lib/modifiers/hide';
 import flip from '@popperjs/core/lib/modifiers/flip';
 import arrow from '@popperjs/core/lib/modifiers/arrow';
diff --git a/addon/components/ui-collapse/component.ts b/addon/components/ui-collapse/component.ts
index a2e079f..4626f04 100644
--- a/addon/components/ui-collapse/component.ts
+++ b/addon/components/ui-collapse/component.ts
@@ -3,7 +3,8 @@ import { computed, set } from '@ember/object';
 import { addObserver } from '@ember/object/observers';
 import { not, and } from '@ember/object/computed';
 import { isPresent } from '@ember/utils';
-import { camelize, htmlSafe } from '@ember/string';
+import { camelize } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 import { scheduleOnce, next } from '@ember/runloop';
 import { Promise } from 'rsvp';
 import { layout, attribute, className, classNames } from '@ember-decorators/component';
diff --git a/addon/components/ui-popper/component.ts b/addon/components/ui-popper/component.ts
index a144d45..160e5cc 100644
--- a/addon/components/ui-popper/component.ts
+++ b/addon/components/ui-popper/component.ts
@@ -4,7 +4,7 @@ import { computed, set } from '@ember/object';
 import { not } from '@ember/object/computed';
 import { assert } from '@ember/debug';
 import { guidFor } from '@ember/object/internals';
-import { htmlSafe } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 import { debounce } from '@ember/runloop';
 import { layout, tagName } from '@ember-decorators/component';
 import { createPopper } from '@popperjs/core/lib/popper-lite';