diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt
index 0249ca5b5e2..21ee0cb8bd3 100644
--- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt
+++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt
@@ -82,7 +82,7 @@ class ClasspathBasedKapt3Extension(
     compilerConfiguration
 ) {
     override val analyzePartially: Boolean
-        get() = useLightAnalysis
+        get() = useLightAnalysis && super.analyzePartially
 
     private var processorLoader: ProcessorLoader? = null
 
@@ -126,6 +126,9 @@ abstract class AbstractKapt3Extension(
         return false
     }
 
+    override val analyzePartially: Boolean
+        get() = !annotationProcessingComplete
+
     override fun doAnalysis(
         project: Project,
         module: ModuleDescriptor,