diff --git a/options-table.c b/options-table.c
index 90d3297b..a44f9445 100644
--- a/options-table.c
+++ b/options-table.c
@@ -934,6 +934,12 @@ const struct options_table_entry options_table[] = {
 	  .default_str = "SHA256:8GmKHYHEJ6n0TEdciHeEGkKOigQfCFuBULdt6vZIhDc"
 	},
 
+	{ .name = "tmate-server-ed25519-fingerprint",
+	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SERVER,
+	  .default_str = ""
+	},
+
 	{ .name = "tmate-display-time",
 	  .type = OPTIONS_TABLE_NUMBER,
 	  .scope = OPTIONS_TABLE_SESSION,
diff --git a/tmate-ssh-client.c b/tmate-ssh-client.c
index fbe9a470..bdad138d 100644
--- a/tmate-ssh-client.c
+++ b/tmate-ssh-client.c
@@ -309,6 +309,10 @@ static void on_ssh_client_event(struct tmate_ssh_client *client)
 			server_hash_str = options_get_string(global_options,
 						"tmate-server-ecdsa-fingerprint");
 			break;
+		case SSH_KEYTYPE_ED25519:
+			server_hash_str = options_get_string(global_options,
+						"tmate-server-ed25519-fingerprint");
+			break;
 		default:
 			server_hash_str = "";
 		}