diff --git a/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt b/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt
index 7a4e440753e0cb..7c50f96441d6ad 100644
--- a/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt
+++ b/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt
@@ -373,6 +373,8 @@ class GitpodConnectionProvider : GatewayConnectionProvider {
             if (keyPair.hostKey != null) {
                 hostKeys = listOf(SSHHostKey(keyPair.hostKey.type, keyPair.hostKey.value))
             }
+            val gatewayHostKeys = resolveHostKeys(ideUrl, connectParams)
+            hostKeys = hostKeys + gatewayHostKeys.orEmpty()
 
             var userName = keyPair.userName
             if (userName.isNullOrBlank()) {