diff --git a/app/assets/javascripts/discourse/initializers/inject-app-events.js.es6 b/app/assets/javascripts/discourse/initializers/inject-app-events.js.es6
index 33e1b9eff0d..c67746d4ed2 100644
--- a/app/assets/javascripts/discourse/initializers/inject-app-events.js.es6
+++ b/app/assets/javascripts/discourse/initializers/inject-app-events.js.es6
@@ -1,7 +1,9 @@
+import AppEvents from 'discourse/lib/app-events';
+
 export default {
   name: "inject-app-events",
   initialize: function(container, application) {
-    application.register('app-events:main', Discourse.AppEvents, { singleton: true });
+    application.register('app-events:main', AppEvents, { singleton: true });
 
     application.inject('controller', 'appEvents', 'app-events:main');
     application.inject('route', 'appEvents', 'app-events:main');
diff --git a/app/assets/javascripts/discourse/lib/app-events.js.es6 b/app/assets/javascripts/discourse/lib/app-events.js.es6
new file mode 100644
index 00000000000..59257700fdf
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/app-events.js.es6
@@ -0,0 +1 @@
+export default Ember.Object.extend(Ember.Evented);
diff --git a/app/assets/javascripts/discourse/lib/app_events.js b/app/assets/javascripts/discourse/lib/app_events.js
deleted file mode 100644
index 1c6a69f9733..00000000000
--- a/app/assets/javascripts/discourse/lib/app_events.js
+++ /dev/null
@@ -1 +0,0 @@
-Discourse.AppEvents = Ember.Object.extend(Ember.Evented);