diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java
index d381c456984c..b49af690af1b 100644
--- a/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java
@@ -45,7 +45,7 @@ final class CompilerProjectExtensionImpl extends CompilerProjectExtension implem
 
   private LocalFileSystem.WatchRequest myCompilerOutputWatchRequest;
   private final Project project;
-  private final boolean useWsm = Registry.is("project.root.manager.over.wsm", false);
+  private final boolean useWsm = Registry.is("project.root.manager.over.wsm", true);
 
   CompilerProjectExtensionImpl(@NotNull Project project) {
     this.project = project;
diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
index c3798abbd505..d4ce4875a030 100644
--- a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
@@ -40,7 +40,7 @@ public final class LanguageLevelProjectExtensionImpl extends LanguageLevelProjec
   private static final String DEFAULT_ATTRIBUTE = "default";
   private static final Logger LOG = Logger.getInstance(LanguageLevelProjectExtensionImpl.class);
 
-  private final boolean useWsm = Registry.is("project.root.manager.over.wsm", false);
+  private final boolean useWsm = Registry.is("project.root.manager.over.wsm", true);
   private final Project myProject;
   private LanguageLevel myCurrentLevel;
 
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/CustomEntitiesCausingReindexTracker.java b/platform/lang-impl/src/com/intellij/util/indexing/CustomEntitiesCausingReindexTracker.java
index 2f6d7f0b843e..28011cf85130 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/CustomEntitiesCausingReindexTracker.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/CustomEntitiesCausingReindexTracker.java
@@ -137,7 +137,7 @@ final class CustomEntitiesCausingReindexTracker {
     } else if (entity instanceof SdkEntity) {
       return hasDependencyOn((SdkEntity) entity, project);
     }
-    else if (entity instanceof ProjectSettingsEntity && Registry.is("project.root.manager.over.wsm", false)) {
+    else if (entity instanceof ProjectSettingsEntity && Registry.is("project.root.manager.over.wsm", true)) {
       return true; // don't care if there are references from modules or not: project sdk is always indexed
     }
     return isEntityToRescan(entity);
diff --git a/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml b/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml
index 82b4dfc1adfb..5f7467227e83 100644
--- a/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml
@@ -125,7 +125,7 @@
     <registryKey key="unknown.sdk.show.editor.actions" defaultValue="true" description="Show editor suggestions to fix missing SKDs"/>
     <registryKey key="psi.vfs.listener.over.wsm" defaultValue="true" restartRequired="true"
                  description="Use WSM listeners to invalidate PSI caches (new) in addition to legacy ModuleRootListener"/>
-    <registryKey key="project.root.manager.over.wsm" defaultValue="false" restartRequired="true"
+    <registryKey key="project.root.manager.over.wsm" defaultValue="true" restartRequired="true"
                  description="Use WSM to hold project settings (java language level, project sdk, compiler outputs)"/>
 
     <editorNotificationProvider implementation="com.intellij.openapi.projectRoots.impl.UnknownSdkEditorNotificationsProvider"/>
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt
index 57d101229ab3..c0797fa1b02f 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt
@@ -169,7 +169,7 @@ open class ProjectRootManagerImpl(
   // This field is not used when useWsm set to `true`
   private val stateComponent = ProjectRootManagerStateComponentImpl(this::projectJdkChanged, this::notifyExtensions)
 
-  protected val useWsm: Boolean = Registry.`is`("project.root.manager.over.wsm", false)
+  protected val useWsm: Boolean = Registry.`is`("project.root.manager.over.wsm", true)
 
   private val rootCache: OrderRootsCache
 
diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/SdkEntityFileIndexContributor.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/SdkEntityFileIndexContributor.kt
index 5a3209a2ddf2..c871aff33280 100644
--- a/platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/SdkEntityFileIndexContributor.kt
+++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/SdkEntityFileIndexContributor.kt
@@ -17,7 +17,7 @@ import com.intellij.workspaceModel.ide.legacyBridge.ModuleDependencyIndex
 
 class SdkEntityFileIndexContributor : WorkspaceFileIndexContributor<SdkEntity>, PlatformInternalWorkspaceFileIndexContributor {
 
-  private val useWsmForProjectSdk: Boolean = Registry.`is`("project.root.manager.over.wsm", false)
+  private val useWsmForProjectSdk: Boolean = Registry.`is`("project.root.manager.over.wsm", true)
 
   override val entityClass: Class<SdkEntity>
     get() = SdkEntity::class.java
diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/serialization/impl/ProjectSettingsSerializer.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/serialization/impl/ProjectSettingsSerializer.kt
index bda2a1e9c343..78e2a64f0c7f 100644
--- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/serialization/impl/ProjectSettingsSerializer.kt
+++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/serialization/impl/ProjectSettingsSerializer.kt
@@ -51,7 +51,7 @@ class ProjectSettingsSerializer(
     errorReporter: ErrorReporter,
     virtualFileManager: VirtualFileUrlManager,
   ): LoadingResult<Map<Class<out WorkspaceEntity>, Collection<WorkspaceEntity.Builder<out WorkspaceEntity>>>> = loadEntitiesTimeMs.addMeasuredTime {
-    if (!Registry.`is`("project.root.manager.over.wsm", false)) {
+    if (!Registry.`is`("project.root.manager.over.wsm", true)) {
       return@addMeasuredTime LoadingResult(emptyMap())
     }
 
@@ -102,7 +102,7 @@ class ProjectSettingsSerializer(
     storage: EntityStorage,
     writer: JpsFileContentWriter,
   ): Unit = saveEntitiesTimeMs.addMeasuredTime {
-    if (!Registry.`is`("project.root.manager.over.wsm", false)) {
+    if (!Registry.`is`("project.root.manager.over.wsm", true)) {
       thisLogger().error( // severity error because we don't expect these entities to exist in the first place
         "ProjectSettingsEntity and JavaProjectSettingsEntity will not be saved, because registry flag " +
         "`project.root.manager.over.wsm` is false"