diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/SimctlListData.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/SimctlListData.kt
index 2a765e197e..90d6811435 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/SimctlListData.kt
+++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/SimctlListData.kt
@@ -55,7 +55,11 @@ internal class DeviceData(
     val dataPathSize: Long? = null,
     val logPath: String? = null,
     val udid: String,
-    val isAvailable: Boolean? = null,
+    /**
+     * Simulator may be unavailable after update Xcode version.
+     * By default, we think what simulator is available.
+     */
+    val isAvailable: Boolean = true,
     val deviceTypeIdentifier: String? = null,
     val state: String,
 )
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerSimulatorTasks.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerSimulatorTasks.kt
index 148d01ff58..eee6cb4169 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerSimulatorTasks.kt
+++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerSimulatorTasks.kt
@@ -36,9 +36,7 @@ fun Project.registerSimulatorTasks(
         doLast {
             val device = getSimctlListData().devices.map { it.value }.flatten()
                 .firstOrNull { device: DeviceData ->
-                    val xcode13Condition = device.state.contains("unavailable")
-                    val xcode14Condition = device.isAvailable == false
-                    device.name == deviceName && (xcode13Condition || xcode14Condition)
+                    device.name == deviceName && !device.isAvailable
                 }
             if (device != null) {
                 runExternalTool(