diff --git a/packages/ember-glimmer/lib/component-managers/custom.ts b/packages/ember-glimmer/lib/component-managers/custom.ts
index 8f376780644..1f1dd2fd5f3 100644
--- a/packages/ember-glimmer/lib/component-managers/custom.ts
+++ b/packages/ember-glimmer/lib/component-managers/custom.ts
@@ -156,7 +156,7 @@ export default class CustomComponentManager<ComponentInstance>
     const capturedArgs = args.capture();
 
     let invocationArgs = valueForCapturedArgs(capturedArgs);
-    const component = delegate.createComponent(definition.ComponentClass, invocationArgs);
+    const component = delegate.createComponent(definition.ComponentClass.class, invocationArgs);
 
     return new CustomComponentState(delegate, component, capturedArgs);
   }
diff --git a/packages/ember-glimmer/tests/integration/custom-component-manager-test.js b/packages/ember-glimmer/tests/integration/custom-component-manager-test.js
index 9de02a05d7d..4ebd7033916 100644
--- a/packages/ember-glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/ember-glimmer/tests/integration/custom-component-manager-test.js
@@ -130,9 +130,8 @@ if (GLIMMER_CUSTOM_COMPONENT_MANAGER) {
           EmberObject.extend({
             capabilities: capabilities('3.4'),
 
-            createComponent(factory, args) {
-              let Klass = factory.class;
-              return new Klass(args);
+            createComponent(Factory, args) {
+              return new Factory(args);
             },
 
             updateComponent() {},