diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
index 753d98c030a..b5ad4f4854e 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
@@ -149,10 +149,9 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
                     createProjectEnvironment(configuration, rootDisposable, EnvironmentConfigFiles.JVM_CONFIG_FILES, messageCollector)
                 if (messageCollector.hasErrors()) return COMPILATION_ERROR
 
-                // TODO: uncomment (KT-61761)
-//                if (!FirKotlinToJvmBytecodeCompiler.checkNotSupportedPlugins(configuration, messageCollector)) {
-//                    return COMPILATION_ERROR
-//                }
+                if (!FirKotlinToJvmBytecodeCompiler.checkNotSupportedPlugins(configuration, messageCollector)) {
+                    return COMPILATION_ERROR
+                }
 
                 compileModulesUsingFrontendIrAndLightTree(
                     projectEnvironment, configuration, messageCollector, buildFile, chunk.single(), targetDescription,
diff --git a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt
index 7d594e30e56..797964f252a 100644
--- a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt
+++ b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptOptions.kt
@@ -130,7 +130,6 @@ enum class KaptFlag(val description: String, val defaultValue: Boolean = false)
     STRIP_METADATA("Strip @Metadata annotations from stubs"),
     KEEP_KDOC_COMMENTS_IN_STUBS("Keep KDoc comments in stubs", defaultValue = true),
     USE_JVM_IR("Use JVM IR backend", defaultValue = true),
-    USE_K2("Use K2"),
     ;
 }
 
diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
index 2a9357edaa9..33718ce721b 100644
--- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
+++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
@@ -125,7 +125,7 @@ class Kapt3CommandLineProcessor : CommandLineProcessor {
             STRIP_METADATA_OPTION -> setFlag(KaptFlag.STRIP_METADATA, value)
             KEEP_KDOC_COMMENTS_IN_STUBS -> setFlag(KaptFlag.KEEP_KDOC_COMMENTS_IN_STUBS, value)
             USE_JVM_IR -> setFlag(KaptFlag.USE_JVM_IR, value)
-            USE_K2 -> setFlag(KaptFlag.USE_K2, value)
+            USE_K2 -> {}
 
             SHOW_PROCESSOR_STATS -> setFlag(KaptFlag.SHOW_PROCESSOR_STATS, value)
             DUMP_PROCESSOR_STATS -> processorsStatsReportFile = File(value)
@@ -169,11 +169,11 @@ class Kapt3CommandLineProcessor : CommandLineProcessor {
 @Suppress("DEPRECATION")
 class Kapt3ComponentRegistrar : ComponentRegistrar {
     override val supportsK2: Boolean
-        get() = false
+        get() = true
 
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         val optionsBuilder = (configuration[KAPT_OPTIONS] ?: KaptOptions.Builder())
-        if (configuration.getBoolean(USE_FIR) || KaptFlag.USE_K2 in optionsBuilder.flags) return
+        if (configuration.getBoolean(USE_FIR)) return
 
         doOpenInternalPackagesIfRequired()
         val contentRoots = configuration[CLIConfigurationKeys.CONTENT_ROOTS] ?: emptyList()
diff --git a/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/Kapt4AnalysisHandlerExtension.kt b/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/Kapt4AnalysisHandlerExtension.kt
index 6c421de627b..369a37a02aa 100644
--- a/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/Kapt4AnalysisHandlerExtension.kt
+++ b/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/Kapt4AnalysisHandlerExtension.kt
@@ -32,8 +32,7 @@ import java.io.File
 
 private class Kapt4AnalysisHandlerExtension : FirAnalysisHandlerExtension() {
     override fun isApplicable(configuration: CompilerConfiguration): Boolean {
-        val options = configuration[KAPT_OPTIONS]
-        return options != null && (configuration.getBoolean(USE_FIR) || KaptFlag.USE_K2 in options.flags)
+        return configuration[KAPT_OPTIONS] != null && configuration.getBoolean(USE_FIR)
     }
 
     @OptIn(KtAnalysisApiInternals::class)
@@ -181,16 +180,11 @@ private class Kapt4AnalysisHandlerExtension : FirAnalysisHandlerExtension() {
 
 class Kapt4CompilerPluginRegistrar : CompilerPluginRegistrar() {
     override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
-        Companion.registerExtensions(this)
+        if (!configuration.getBoolean(USE_FIR)) return
+
+        FirAnalysisHandlerExtension.registerExtension(Kapt4AnalysisHandlerExtension())
     }
 
     override val supportsK2: Boolean
         get() = true
-
-
-    companion object {
-        fun registerExtensions(extensionStorage: ExtensionStorage) = with(extensionStorage) {
-            FirAnalysisHandlerExtension.registerExtension(Kapt4AnalysisHandlerExtension())
-        }
-    }
 }