diff --git a/ember_debug/data-debug.js b/ember_debug/data-debug.js
index a421af6f75..bc53d818d7 100644
--- a/ember_debug/data-debug.js
+++ b/ember_debug/data-debug.js
@@ -33,8 +33,11 @@ export default EmberObject.extend(PortMixin, {
     } else if (container.resolve) {
       // Ember < 1.11
       return container.resolve(name);
+    } else if (container.resolveRegistration) {
+      // Ember >= 2.1
+      return container.resolveRegistration(name);
     } else {
-      // Ember >= 2.0
+      // Ember >= 2.0 < 2.1
       return container.registry.resolve(name);
     }