diff --git a/app/assets/javascripts/discourse-shims.js b/app/assets/javascripts/discourse-shims.js
index f790ed9b050..e359e051ec8 100644
--- a/app/assets/javascripts/discourse-shims.js
+++ b/app/assets/javascripts/discourse-shims.js
@@ -16,3 +16,7 @@ define("ember", ["exports"], function(__exports__) {
 define("message-bus-client", ["exports"], function(__exports__) {
   __exports__.default = window.MessageBus;
 });
+
+define("ember-buffered-proxy/proxy", ["exports"], function(__exports__) {
+  __exports__.default = window.BufferedProxy;
+});
diff --git a/app/assets/javascripts/discourse/app/controllers/reorder-categories.js b/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
index 41df5565543..c59cc0d23f1 100644
--- a/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
@@ -4,7 +4,7 @@ import EmberObjectProxy from "@ember/object/proxy";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-const BufferedProxy = window.BufferedProxy; // import BufferedProxy from 'ember-buffered-proxy/proxy';
+import BufferedProxy from "ember-buffered-proxy/proxy";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/discourse/app/mixins/buffered-content.js b/app/assets/javascripts/discourse/app/mixins/buffered-content.js
index beb145a3ec2..55a0463f583 100644
--- a/app/assets/javascripts/discourse/app/mixins/buffered-content.js
+++ b/app/assets/javascripts/discourse/app/mixins/buffered-content.js
@@ -1,8 +1,8 @@
 import EmberObjectProxy from "@ember/object/proxy";
 import Mixin from "@ember/object/mixin";
 import { computed } from "@ember/object";
+import BufferedProxy from "ember-buffered-proxy/proxy";
 
-/* global BufferedProxy: true */
 export function bufferedProperty(property) {
   const mixin = {
     buffered: computed(property, function() {