diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba7561c3336308d4961020f7fba57a75695f8d33..12e7e01cbe8b25450fee355864d5fe3a55567aa0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#533 - NSG build failed with MetricType Inner Product
 - \#543 - client raise exception in shards when search results is empty
 - \#545 - Avoid dead circle of build index thread when error occurs
+- \#547 - NSG build failed using GPU-edition if set gpu_enable false
 - \#552 - Server down during building index_type: IVF_PQ using GPU-edition
 - \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error
 - \#599 - Build index log is incorrect
diff --git a/core/src/index/knowhere/knowhere/index/vector_index/IndexNSG.cpp b/core/src/index/knowhere/knowhere/index/vector_index/IndexNSG.cpp
index 16c0b9172f6a85b6d88479e961ebcf6d6083d8f9..9f00c82fd41f0bfeeee18e4d472bf21b9690c269 100644
--- a/core/src/index/knowhere/knowhere/index/vector_index/IndexNSG.cpp
+++ b/core/src/index/knowhere/knowhere/index/vector_index/IndexNSG.cpp
@@ -117,7 +117,13 @@ NSG::Train(const DatasetPtr& dataset, const Config& config) {
 
     // TODO(linxj): dev IndexFactory, support more IndexType
 #ifdef MILVUS_GPU_VERSION
+    auto temp_resource = FaissGpuResourceMgr::GetInstance().GetRes(build_cfg->gpu_id);
+#if temp_resource == nullptr
+    auto preprocess_index = std::make_shared<IVF>();
+#else
     auto preprocess_index = std::make_shared<GPUIVF>(build_cfg->gpu_id);
+#endif
+
 #else
     auto preprocess_index = std::make_shared<IVF>();
 #endif