diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt b/java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt
index 4967ff72a5a4..dc06928c1a64 100644
--- a/java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt
+++ b/java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt
@@ -149,12 +149,11 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
     else {
       var useValue = false
       options.asSequence()
-        .filter { it.startsWith(name) }
         .map {
           when {
-            it.length == name.length -> { useValue = true; "" }
+            it == name -> { useValue = true; "" }
             useValue -> { useValue = false; it }
-            it[name.length] == '=' -> it.substring(name.length + 1)
+            it.startsWith(name) && it[name.length] == '=' -> it.substring(name.length + 1)
             else -> ""
           }
         }