diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c
index 3d4808252..5ed9d64e6 100644
--- a/lib/bdev/bdev.c
+++ b/lib/bdev/bdev.c
@@ -893,6 +893,8 @@ spdk_bdev_mgr_unregister_cb(void *io_device)
 	cb_fn(g_fini_cb_arg);
 	g_fini_cb_fn = NULL;
 	g_fini_cb_arg = NULL;
+	g_bdev_mgr.init_complete = false;
+	g_bdev_mgr.module_init_complete = false;
 }
 
 static void
diff --git a/lib/event/subsystems/nvmf/nvmf_tgt.c b/lib/event/subsystems/nvmf/nvmf_tgt.c
index a2a14991d..940967919 100644
--- a/lib/event/subsystems/nvmf/nvmf_tgt.c
+++ b/lib/event/subsystems/nvmf/nvmf_tgt.c
@@ -293,6 +293,7 @@ nvmf_tgt_destroy_done(void *ctx, int status)
 	}
 
 	free(g_spdk_nvmf_tgt_conf);
+	g_spdk_nvmf_tgt_conf = NULL;
 	nvmf_tgt_advance_state();
 }