diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c
index 487e4aee2..cfb482e7e 100644
--- a/app/nvmf_tgt/nvmf_tgt.c
+++ b/app/nvmf_tgt/nvmf_tgt.c
@@ -192,7 +192,7 @@ nvmf_tgt_create_subsystem(const char *name, enum spdk_nvmf_subtype subtype,
 	struct spdk_nvmf_subsystem *subsystem;
 	struct nvmf_tgt_subsystem *app_subsys;
 
-	if (spdk_nvmf_subsystem_exists(name)) {
+	if (spdk_nvmf_find_subsystem(name)) {
 		SPDK_ERRLOG("Subsystem already exist\n");
 		return NULL;
 	}
diff --git a/include/spdk/nvmf.h b/include/spdk/nvmf.h
index 91387351b..a4f52d589 100644
--- a/include/spdk/nvmf.h
+++ b/include/spdk/nvmf.h
@@ -152,8 +152,6 @@ void spdk_nvmf_delete_subsystem(struct spdk_nvmf_subsystem *subsystem);
 
 struct spdk_nvmf_subsystem *spdk_nvmf_find_subsystem(const char *subnqn);
 
-bool spdk_nvmf_subsystem_exists(const char *subnqn);
-
 bool spdk_nvmf_subsystem_host_allowed(struct spdk_nvmf_subsystem *subsystem, const char *hostnqn);
 
 struct spdk_nvmf_listen_addr *spdk_nvmf_tgt_listen(const char *trname, const char *traddr,
diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c
index 2cdd49939..532520ace 100644
--- a/lib/nvmf/subsystem.c
+++ b/lib/nvmf/subsystem.c
@@ -45,24 +45,6 @@
 #include "spdk_internal/bdev.h"
 #include "spdk_internal/log.h"
 
-bool
-spdk_nvmf_subsystem_exists(const char *subnqn)
-{
-	struct spdk_nvmf_subsystem	*subsystem;
-
-	if (!subnqn) {
-		return false;
-	}
-
-	TAILQ_FOREACH(subsystem, &g_nvmf_tgt.subsystems, entries) {
-		if (strcmp(subnqn, subsystem->subnqn) == 0) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 struct spdk_nvmf_subsystem *
 spdk_nvmf_find_subsystem(const char *subnqn)
 {