diff --git a/ember_debug/utils/type-check.js b/ember_debug/utils/type-check.js
index 1bed8ae46e..63acde8fb3 100644
--- a/ember_debug/utils/type-check.js
+++ b/ember_debug/utils/type-check.js
@@ -30,7 +30,8 @@ export function isDescriptor(value) {
  */
 export function getDescriptorFor(object, key) {
   if (Ember.Debug.isComputed) {
-    return Ember.__loader.require('@ember/-internals/metal').descriptorForDecorator(object[key]);
+    const { descriptorForDecorator, descriptorForProperty } = Ember.__loader.require('@ember/-internals/metal');
+    return descriptorForDecorator(object[key]) || descriptorForProperty(object, key);
   }
 
   return object[key];