diff --git a/src/babel/traversal/scope/index.js b/src/babel/traversal/scope/index.js
index 1c9ec7b940..316e2494db 100644
--- a/src/babel/traversal/scope/index.js
+++ b/src/babel/traversal/scope/index.js
@@ -599,8 +599,13 @@ export default class Scope {
 
     // Class
 
-    if (path.isClass() && path.has("id")) {
-      this.registerBinding("var", path.get("id"));
+    if (path.isClassDeclaration()) {
+      var name = path.node.id.name;
+      this.bindings[name] = this.parent.bindings[name];
+    }
+
+    if (path.isClassExpression() && path.has("id")) {
+      this.registerBinding("var", path);
     }
 
     // Function - params, rest