diff --git a/common/dynamicconfig/configstore/config_store_client.go b/common/dynamicconfig/configstore/config_store_client.go
index edd309b9abf..ceb7be19139 100644
--- a/common/dynamicconfig/configstore/config_store_client.go
+++ b/common/dynamicconfig/configstore/config_store_client.go
@@ -252,7 +252,7 @@ func (csc *configStoreClient) GetListValue(name dc.ListKey, filters map[dc.Filte
 
 func (csc *configStoreClient) UpdateValue(name dc.Key, value interface{}) error {
 	dcValues, ok := value.([]*types.DynamicConfigValue)
-	if !ok && dcValues != nil {
+	if !ok && value != nil {
 		return errors.New("invalid value")
 	}
 	return csc.updateValue(name, dcValues, csc.config.UpdateRetryAttempts)
diff --git a/service/frontend/adminHandler.go b/service/frontend/adminHandler.go
index f788636548c..f9c14439739 100644
--- a/service/frontend/adminHandler.go
+++ b/service/frontend/adminHandler.go
@@ -242,7 +242,7 @@ func (adh *adminHandlerImpl) AddSearchAttribute(
 	// update dynamic config. Until the DB based dynamic config is implemented, we shouldn't fail the updating.
 	err = adh.params.DynamicConfig.UpdateValue(dc.ValidSearchAttributes, currentValidAttr)
 	if err != nil {
-		adh.GetLogger().Warn("Failed to update dynamicconfig. This is only useful in local dev environment. Please ignore this warn if this is in a real Cluster, because you dynamicconfig MUST be updated separately")
+		adh.GetLogger().Warn("Failed to update dynamicconfig. This is only useful in local dev environment for filebased config. Please ignore this warn if this is in a real Cluster, because your filebased dynamicconfig MUST be updated separately. Configstore dynamic config will also require separate updating via the CLI.")
 	}
 
 	// update elasticsearch mapping, new added field will not be able to remove or update