diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt
index 1215e796203..7e963720b6a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt
@@ -25,13 +25,9 @@ class ClassResolutionScopesSupport(
         storageManager: StorageManager,
         private val getOuterScope: () -> JetScope
 ) {
-    private val staticScope = StaticScopeForKotlinClass(classDescriptor)
-
     private val scopeForClassHeaderResolution = storageManager.createLazyValue { computeScopeForClassHeaderResolution() }
     private val scopeForMemberDeclarationResolution = storageManager.createLazyValue { computeScopeForMemberDeclarationResolution() }
 
-    fun getStaticScope(): JetScope = staticScope
-
     fun getScopeForClassHeaderResolution(): JetScope = scopeForClassHeaderResolution()
 
     fun getScopeForMemberDeclarationResolution(): JetScope = scopeForMemberDeclarationResolution()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
index 7d6f98f7dd2..96c8424af87 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
@@ -89,6 +89,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
     private final MemoizedFunctionToNotNull<JetObjectDeclaration, ClassDescriptor> extraCompanionObjectDescriptors;
 
     private final LazyClassMemberScope unsubstitutedMemberScope;
+    private final JetScope staticScope;
 
     private final NotNullLazyValue<JetScope> scopeForPropertyInitializerResolution;
 
@@ -118,6 +119,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         this.declarationProvider = c.getDeclarationProviderFactory().getClassMemberDeclarationProvider(classLikeInfo);
 
         this.unsubstitutedMemberScope = createMemberScope(c, this.declarationProvider);
+        this.staticScope = new StaticScopeForKotlinClass(this);
 
         this.typeConstructor = new LazyClassTypeConstructor();
 
@@ -314,7 +316,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
     @NotNull
     @Override
     public JetScope getStaticScope() {
-        return resolutionScopesSupport.getStaticScope();
+        return staticScope;
     }
 
     @NotNull