diff --git a/rw_core/core/core.go b/rw_core/core/core.go
index 44fb224..01543ff 100644
--- a/rw_core/core/core.go
+++ b/rw_core/core/core.go
@@ -77,7 +77,7 @@
 	if err != nil {
 		logger.Fatal(ctx, err)
 	}
-	defer stopKVClient(context.Background(), kvClient)
+	defer stopKVClient(log.WithSpanFromContext(context.Background(), ctx), kvClient)
 
 	// sync logging config with kv store
 	cm := conf.NewConfigManager(ctx, kvClient, cf.KVStoreType, cf.KVStoreAddress, cf.KVStoreTimeout)