diff --git a/packages/babel-plugin-transform-regenerator/lib/visit.js b/packages/babel-plugin-transform-regenerator/lib/visit.js
index 0f68ffc686..c4a0d2efb2 100644
--- a/packages/babel-plugin-transform-regenerator/lib/visit.js
+++ b/packages/babel-plugin-transform-regenerator/lib/visit.js
@@ -146,6 +146,10 @@ function getOuterFnExpr(funPath) {
   var node = funPath.node;
   t.assertFunction(node);
 
+  if (!node.id) {
+    node.id = funPath.scope.parent.generateUidIdentifier("callee");
+  }
+
   if (node.generator && // Non-generator functions don't need to be marked.
       t.isFunctionDeclaration(node)) {
     var pp = funPath.findParent(function (path) {
@@ -171,9 +175,7 @@ function getOuterFnExpr(funPath) {
     );
   }
 
-  return node.id || (
-    node.id = funPath.scope.parent.generateUidIdentifier("callee")
-  );
+  return node.id;
 }
 
 function getRuntimeMarkDecl(blockPath) {