diff --git a/packages/ember-views/lib/components/component.js b/packages/ember-views/lib/components/component.js
index dde9bf2c727..036fafc0a84 100644
--- a/packages/ember-views/lib/components/component.js
+++ b/packages/ember-views/lib/components/component.js
@@ -165,7 +165,7 @@ var Component = View.extend(TargetActionSupport, {
     assert(
       `You can not define a function that handles DOM events in the \`${this}\` tagless component since it doesn't have any DOM element.`,
       this.tagName !== '' || !(() => {
-        let eventDispatcher = this.container.lookup('event_dispatcher:main');
+        let eventDispatcher = getOwner(this).lookup('event_dispatcher:main');
         let events = (eventDispatcher && eventDispatcher._finalEvents) || {};
 
         for (let key in events) {
diff --git a/packages/ember-views/tests/views/component_test.js b/packages/ember-views/tests/views/component_test.js
index b2f18787de8..e7248f3270f 100644
--- a/packages/ember-views/tests/views/component_test.js
+++ b/packages/ember-views/tests/views/component_test.js
@@ -13,6 +13,7 @@ import Component from 'ember-views/components/component';
 
 import { MUTABLE_CELL } from 'ember-views/compat/attrs-proxy';
 import buildOwner from 'container/tests/test-helpers/build-owner';
+import { OWNER } from 'container/owner';
 
 var a_slice = Array.prototype.slice;
 
@@ -310,7 +311,7 @@ QUnit.test('throws an error if an event function is defined in a tagless compone
 
   let TestComponent = Component.extend({
     tagName: '',
-    container: appInstance,
+    [OWNER]: appInstance,
     click() { }
   });
 
@@ -339,7 +340,7 @@ QUnit.test('throws an error if an Application custom event handler is defined in
 
   let TestComponent = Component.extend({
     tagName: '',
-    container: appInstance,
+    [OWNER]: appInstance,
     sauce() { }
   });
 
@@ -367,7 +368,7 @@ QUnit.test('throws an error if an ApplicationInstance custom event handler is de
 
   let TestComponent = Component.extend({
     tagName: '',
-    container: appInstance,
+    [OWNER]: appInstance,
     hurts() { }
   });