diff --git a/lib/nvme/nvme_opal.c b/lib/nvme/nvme_opal.c
index e2f8c7974..c1c2259ac 100644
--- a/lib/nvme/nvme_opal.c
+++ b/lib/nvme/nvme_opal.c
@@ -50,8 +50,6 @@ opal_security_recv(struct spdk_opal_dev *dev, struct opal_session *sess)
 	void *response = sess->resp;
 	struct spdk_opal_compacket *header = response;
 	int ret = 0;
-	uint64_t start = spdk_get_ticks();
-	uint64_t now;
 
 	do {
 		memset(response, 0, IO_BUFFER_LENGTH);
@@ -67,18 +65,12 @@ opal_security_recv(struct spdk_opal_dev *dev, struct opal_session *sess)
 
 		if (header->outstanding_data == 0 &&
 		    header->min_transfer == 0) {
-			return 0;	/* return if all the response data are ready by tper and received by host */
-		} else {	/* check timeout */
-			now = spdk_get_ticks();
-			if (now - start > dev->timeout * spdk_get_ticks_hz()) {
-				SPDK_ERRLOG("Secutiy Receive Timeout on dev = %p\n", dev);
-				return 0x0F; /* TPer Malfunction */
-			}
+			/* return if all the response data are ready by tper and received by host */
+			return 0;
 		}
+	} while (true);
 
-	} while (!ret);
-
-	return ret;
+	return 0;
 }
 
 static int
@@ -1802,7 +1794,6 @@ struct spdk_opal_dev *
 	}
 
 	dev->ctrlr = ctrlr;
-	dev->timeout = SPDK_OPAL_TPER_TIMEOUT;
 
 	payload = calloc(1, IO_BUFFER_LENGTH);
 	if (!payload) {
diff --git a/lib/nvme/nvme_opal_internal.h b/lib/nvme/nvme_opal_internal.h
index 0af8f6240..db86c66a3 100644
--- a/lib/nvme/nvme_opal_internal.h
+++ b/lib/nvme/nvme_opal_internal.h
@@ -43,8 +43,6 @@
 #define OPAL_KEY_MAX			256
 #define OPAL_UID_LENGTH			8
 
-#define SPDK_OPAL_TPER_TIMEOUT		600 /* seconds */
-
 #define GENERIC_HOST_SESSION_NUM	0x69
 
 #define OPAL_INVAL_PARAM		12
@@ -257,7 +255,6 @@ struct spdk_opal_dev {
 
 	struct spdk_opal_d0_features_info feat_info;
 
-	uint64_t timeout;   /* seconds */
 	uint8_t max_ranges; /* max locking range number */
 	struct spdk_opal_locking_range_info locking_ranges[SPDK_OPAL_MAX_LOCKING_RANGE];