diff --git a/src/index.js b/src/index.js
index 104a719..36c147e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -57,22 +57,22 @@ export default function prepass(
 
     let isClassComponent = false;
 
+    // Necessary for createContext api. Setting this property will pass
+    // the context value as `this.context` just for this component.
+    let cxType = nodeName.contextType;
+    let provider = cxType && context[cxType.__c];
+    let cctx =
+      cxType != null
+        ? provider
+          ? provider.props.value
+          : cxType[createContextDefaultValue] ||
+            cxType[createContextDefaultValueNew]
+        : context;
+
     if (
       !nodeName.prototype ||
       typeof nodeName.prototype.render !== "function"
     ) {
-      // Necessary for createContext api. Setting this property will pass
-      // the context value as `this.context` just for this component.
-      let cxType = nodeName.contextType;
-      let provider = cxType && context[cxType.__c];
-      let cctx =
-        cxType != null
-          ? provider
-            ? provider.props.value
-            : cxType[createContextDefaultValue] ||
-              cxType[createContextDefaultValueNew]
-          : context;
-
       // stateless functional components
       doRender = () => {
         try {
@@ -96,12 +96,12 @@ export default function prepass(
 
       // class-based components
       // c = new nodeName(props, context);
-      c = vnode.__c = new nodeName(props, context);
+      c = vnode.__c = new nodeName(props, cctx);
       // initialize components in dirty state so setState() doesn't enqueue re-rendering:
       c.__d = true;
       c.__v = vnode;
       c.props = props;
-      c.context = context;
+      c.context = cctx;
       if (c.state === undefined) {
         c.state = {};
       }
diff --git a/src/index.test.js b/src/index.test.js
index 3a4faeb..bfbb898 100644
--- a/src/index.test.js
+++ b/src/index.test.js
@@ -551,6 +551,46 @@ describe("prepass", () => {
 
       expect(renderFn.mock.calls).toEqual([[123]]);
     });
+
+    it("should support createContext this.context inside classes with defaultValue", async () => {
+      const ctx = createContext(123);
+      let ctxValue;
+
+      class Inner extends Component {
+        render() {
+          ctxValue = this.context;
+          return null;
+        }
+      }
+
+      Inner.contextType = ctx;
+
+      await prepass(<Inner />);
+
+      expect(ctxValue).toEqual(123);
+    });
+
+    it("should support createContext this.context inside classes", async () => {
+      const ctx = createContext(123);
+      let ctxValue;
+
+      class Inner extends Component {
+        render() {
+          ctxValue = this.context;
+          return null;
+        }
+      }
+
+      Inner.contextType = ctx;
+
+      await prepass(
+        <ctx.Provider value={456}>
+          <Inner />
+        </ctx.Provider>
+      );
+
+      expect(ctxValue).toEqual(456);
+    });
   });
 
   describe("lazy", () => {