diff --git a/packages/babel-plugin-proposal-optional-chaining/src/index.js b/packages/babel-plugin-proposal-optional-chaining/src/index.js
index 0a6db9be99ad..918a59ade508 100644
--- a/packages/babel-plugin-proposal-optional-chaining/src/index.js
+++ b/packages/babel-plugin-proposal-optional-chaining/src/index.js
@@ -82,14 +82,12 @@ export default declare((api, options) => {
               let context = scope.maybeGenerateMemoised(object);
               if (context) {
                 chain.object = t.assignmentExpression("=", context, object);
+              } else if (t.isSuper(object)) {
+                context = t.thisExpression();
               } else {
                 context = object;
               }
 
-              if (t.isSuper(context)) {
-                context = t.thisExpression();
-              }
-
               node.arguments.unshift(t.cloneNode(context));
               node.callee = t.memberExpression(
                 node.callee,