diff --git a/fabrics.c b/fabrics.c
index 9eb6a09e96..a53cd4b1cc 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -1120,6 +1120,16 @@ int nvmf_connect(const char *desc, int argc, char **argv)
 
 	nvme_parse_tls_args(keyring, tls_key, tls_key_identity, &cfg, c);
 
+	/*
+	 * We are connecting to a discovery controller, so let's treat
+	 * this as a persistent connection and specify a KATO.
+	 */
+	if (!strcmp(subsysnqn, NVME_DISC_SUBSYS_NAME)) {
+		persistent = true;
+
+		set_discovery_kato(&cfg);
+	}
+
 	ret = nvme_add_ctrl(h, c, &cfg);
 	if (ret) {
 		fprintf(stderr, "could not add new controller: %s\n",