diff --git a/app/iscsi_tgt/iscsi_tgt.c b/app/iscsi_tgt/iscsi_tgt.c
index f550509fe3..fcf3cbccf4 100644
--- a/app/iscsi_tgt/iscsi_tgt.c
+++ b/app/iscsi_tgt/iscsi_tgt.c
@@ -47,8 +47,6 @@
 #include "spdk/log.h"
 #include "spdk/net.h"
 
-uint64_t g_flush_timeout;
-
 static void
 spdk_iscsi_dump_memory_info(void)
 {
diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c
index 2b8f53a548..164d0d6072 100644
--- a/lib/iscsi/conn.c
+++ b/lib/iscsi/conn.c
@@ -1077,7 +1077,7 @@ spdk_iscsi_conn_execute(struct spdk_iscsi_conn *conn)
 
 	/* If flush timer has expired, flush all PDUs */
 	tsc = rte_get_timer_cycles();
-	if (tsc - conn->last_flush > g_flush_timeout) {
+	if (tsc - conn->last_flush > g_spdk_iscsi.flush_timeout) {
 		conn->last_flush = tsc;
 		if (spdk_iscsi_conn_flush_pdus(conn) != 0) {
 			conn->state = ISCSI_CONN_STATE_EXITING;
diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h
index 057755e38a..8c6a1d479d 100644
--- a/lib/iscsi/iscsi.h
+++ b/lib/iscsi/iscsi.h
@@ -54,8 +54,6 @@
 #define SPDK_ISCSI_DEFAULT_AUTHFILE SPDK_ISCSI_BUILD_ETC "/auth.conf"
 #define SPDK_ISCSI_DEFAULT_NODEBASE "iqn.2016-06.io.spdk"
 
-extern uint64_t g_flush_timeout;
-
 #define DEFAULT_MAXR2T 4
 #define MAX_INITIATOR_NAME 256
 #define MAX_TARGET_NAME 256
@@ -273,6 +271,7 @@ struct spdk_iscsi_globals {
 	int req_discovery_auth;
 	int req_discovery_auth_mutual;
 	int discovery_auth_group;
+	uint64_t flush_timeout;
 
 	uint32_t MaxSessions;
 	uint32_t MaxConnectionsPerSession;
diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c
index 3c1eb40424..f1a1ed660e 100644
--- a/lib/iscsi/iscsi_subsystem.c
+++ b/lib/iscsi/iscsi_subsystem.c
@@ -819,14 +819,11 @@ spdk_iscsi_app_read_parameters(void)
 
 	val = spdk_conf_section_get_val(sp, "FlushTimeout");
 	if (val == NULL) {
-		g_flush_timeout = DEFAULT_FLUSH_TIMEOUT *
-				  (rte_get_timer_hz() >> 20);
+		g_spdk_iscsi.flush_timeout = DEFAULT_FLUSH_TIMEOUT * (rte_get_timer_hz() >> 20);
 	} else {
-		g_flush_timeout = strtoul(val, NULL, 10) *
-				  (rte_get_timer_hz() >> 20);
+		g_spdk_iscsi.flush_timeout = strtoul(val, NULL, 10) * (rte_get_timer_hz() >> 20);
 	}
-	SPDK_TRACELOG(SPDK_TRACE_DEBUG, "FlushTimeout %"PRIu64"\n",
-		      g_flush_timeout);
+	SPDK_TRACELOG(SPDK_TRACE_DEBUG, "FlushTimeout %"PRIu64"\n", g_spdk_iscsi.flush_timeout);
 
 	nopininterval = spdk_conf_section_get_intval(sp, "NopInInterval");
 	if (nopininterval < 0) {