diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/connection/JetBrainsClientDownloadInfo.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/connection/JetBrainsClientDownloadInfo.kt
index 0b923c29addf..c43e984c7888 100644
--- a/platform/remoteDev-util/src/com/intellij/remoteDev/connection/JetBrainsClientDownloadInfo.kt
+++ b/platform/remoteDev-util/src/com/intellij/remoteDev/connection/JetBrainsClientDownloadInfo.kt
@@ -5,6 +5,7 @@ import org.jetbrains.annotations.ApiStatus
 @ApiStatus.Experimental
 open class JetBrainsClientDownloadInfo(
   val hostBuildNumber: String,
+  val clientBuildNumber: String = hostBuildNumber,
   val compatibleClientUrl: String,
   val compatibleJreUrl: String?,
   val downloadPgpPublicKeyUrl: String?
diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
index 2ab82a2da06e..5b735774c9cc 100644
--- a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
+++ b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
@@ -226,6 +226,7 @@ object CodeWithMeClientDownloader {
 
     val sessionInfo = JetBrainsClientDownloadInfo(
       hostBuildNumber = hostBuildNumber,
+      clientBuildNumber = clientBuildNumber, 
       compatibleClientUrl = clientDownloadUrl,
       compatibleJreUrl = jreDownloadUrl,
       downloadPgpPublicKeyUrl = pgpPublicKeyUrl
@@ -346,9 +347,9 @@ object CodeWithMeClientDownloader {
                            progressIndicator: ProgressIndicator): ExtractedJetBrainsClientData {
     ApplicationManager.getApplication().assertIsNonDispatchThread()
 
-    val embeddedClientLauncher = createEmbeddedClientLauncherIfAvailable(sessionInfoResponse.hostBuildNumber)
+    val embeddedClientLauncher = createEmbeddedClientLauncherIfAvailable(sessionInfoResponse.clientBuildNumber)
     if (embeddedClientLauncher != null) {
-      return ExtractedJetBrainsClientData(Path(PathManager.getHomePath()), null, sessionInfoResponse.hostBuildNumber)
+      return ExtractedJetBrainsClientData(Path(PathManager.getHomePath()), null, sessionInfoResponse.clientBuildNumber)
     }
 
     val tempDir = FileUtil.createTempDirectory("jb-cwm-dl", null).toPath()
@@ -359,7 +360,7 @@ object CodeWithMeClientDownloader {
       url = clientUrl,
       tempDir = tempDir,
       cachesDir = config.clientCachesDir,
-      includeInManifest = getJetBrainsClientManifestFilter(sessionInfoResponse.hostBuildNumber),
+      includeInManifest = getJetBrainsClientManifestFilter(sessionInfoResponse.clientBuildNumber),
     )
 
     val jdkUrl = sessionInfoResponse.compatibleJreUrl?.let { URI(it) }
@@ -527,7 +528,7 @@ object CodeWithMeClientDownloader {
       if (!guestSucceeded || !jdkSucceeded) error("Guest or jdk was not downloaded")
 
       LOG.info("Download of guest and jdk succeeded")
-      return ExtractedJetBrainsClientData(clientDir = guestData.targetPath, jreDir = jdkData?.targetPath, version = sessionInfoResponse.hostBuildNumber)
+      return ExtractedJetBrainsClientData(clientDir = guestData.targetPath, jreDir = jdkData?.targetPath, version = sessionInfoResponse.clientBuildNumber)
     }
     catch(e: ProcessCanceledException) {
       LOG.info("Download was canceled")
diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeGuestLauncher.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeGuestLauncher.kt
index ef1ff856d012..fc701c10fad3 100644
--- a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeGuestLauncher.kt
+++ b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeGuestLauncher.kt
@@ -142,7 +142,7 @@ object CodeWithMeGuestLauncher {
       url = clientUrl,
       tempDir = tempDir,
       cachesDir = service<JetBrainsClientDownloaderConfigurationProvider>().clientCachesDir,
-      includeInManifest = CodeWithMeClientDownloader.getJetBrainsClientManifestFilter(sessionInfo.hostBuildNumber),
+      includeInManifest = CodeWithMeClientDownloader.getJetBrainsClientManifestFilter(sessionInfo.clientBuildNumber),
     )
     val lifetime = aLifetime ?: project?.createLifetime() ?: Lifetime.Eternal
     val clientLifetime = CodeWithMeClientDownloader.runCwmGuestProcessFromDownload(