diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
index 33c8ad620b1..91a2687346f 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
@@ -6,7 +6,7 @@ import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { propertyNotEqual } from "discourse/lib/computed";
 import { equal, reads } from "@ember/object/computed";
-import { run } from "@ember/runloop";
+import { next } from "@ember/runloop";
 import { action } from "@ember/object";
 import getURL from "discourse-common/lib/get-url";
 
@@ -33,7 +33,7 @@ export default Controller.extend(bufferedProperty("model"), {
     // this is needed because the model doesnt have default values
     // and as we are using a bufferedProperty it's not accessible
     // in any other way
-    run.next(() => {
+    next(() => {
       if (this.model) {
         if (!this.model.badge_type_id) {
           this.model.set(
diff --git a/app/assets/javascripts/discourse/app/helpers/route-action.js b/app/assets/javascripts/discourse/app/helpers/route-action.js
index c55052a6ddc..d9dcad74e33 100644
--- a/app/assets/javascripts/discourse/app/helpers/route-action.js
+++ b/app/assets/javascripts/discourse/app/helpers/route-action.js
@@ -2,7 +2,7 @@ import { A } from "@ember/array";
 import Helper from "@ember/component/helper";
 import { computed, get } from "@ember/object";
 import { getOwner } from "@ember/application";
-import { run } from "@ember/runloop";
+import { join } from "@ember/runloop";
 import { assert, runInDebug } from "@ember/debug";
 
 function getCurrentRouteInfos(router) {
@@ -40,7 +40,7 @@ export function routeAction(actionName, router, ...params) {
   return function (...invocationArgs) {
     let { action, handler } = getRouteWithAction(router, actionName);
     let args = params.concat(invocationArgs);
-    return run.join(handler, action, ...args);
+    return join(handler, action, ...args);
   };
 }
 
diff --git a/app/assets/javascripts/discourse/app/lib/d-popover.js b/app/assets/javascripts/discourse/app/lib/d-popover.js
index 052ae5c2018..9c943d979a1 100644
--- a/app/assets/javascripts/discourse/app/lib/d-popover.js
+++ b/app/assets/javascripts/discourse/app/lib/d-popover.js
@@ -1,5 +1,5 @@
 import { isLegacyEmber } from "discourse-common/config/environment";
-import { run } from "@ember/runloop";
+import { begin, end } from "@ember/runloop";
 import tippy from "tippy.js";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
@@ -41,8 +41,8 @@ export function showPopover(event, options = {}) {
 
   // hangs on legacy ember
   if (!isLegacyEmber) {
-    run.begin();
-    instance.popper.addEventListener("transitionend", run.end, {
+    begin();
+    instance.popper.addEventListener("transitionend", end, {
       once: true,
     });
   }