diff --git a/settings.gradle b/settings.gradle
index 745f00c61a6..f7a34e4f8b0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -329,7 +329,10 @@ if (buildProperties.getOrNull("attachedIntellijVersion") != null) {
             project(projectName).projectDir = it.parentFile
         }
     }
-} else {
+}
+
+if (!buildProperties.getBoolean("disableKotlinPluginModules", false) && buildProperties.getOrNull("attachedIntellijVersion") == null) {
+    logger.info("Old Kotlin plugin modules are disabled")
     include ":idea:idea-jvm",
             ":idea:idea-maven",
             ":idea:idea-gradle",