diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index bcd09d3a44dad5cf0d8d99de5c96f25a1aa1ff84..738794af3f389e9ee9939b2002b7ef6da03bc711 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -617,7 +617,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
 	char *options, *o, *p;
 	int token, ret = 0;
 	size_t nqnlen  = 0;
-	int ctrl_loss_tmo = NVMF_DEF_CTRL_LOSS_TMO;
+	int ctrl_loss_tmo = NVMF_DEF_RECONNECT_FOREVER;
 	uuid_t hostid;
 
 	/* Set defaults */
diff --git a/drivers/nvme/host/fabrics.h b/drivers/nvme/host/fabrics.h
index aa2fdb2a2e8fc0143b59ff48692284ba50c8225f..188ebbeec32cea1789f62fa89b46bb2f1500a709 100644
--- a/drivers/nvme/host/fabrics.h
+++ b/drivers/nvme/host/fabrics.h
@@ -23,6 +23,7 @@
 #define NVMF_DEF_RECONNECT_DELAY	10
 /* default to 600 seconds of reconnect attempts before giving up */
 #define NVMF_DEF_CTRL_LOSS_TMO		600
+#define NVMF_DEF_RECONNECT_FOREVER	-1
 
 /*
  * Define a host as seen by the target.  We allocate one at boot, but also