diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeBakingWindow.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeBakingWindow.cs
index 66cba4bc123..048ee47216f 100644
--- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeBakingWindow.cs
+++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeBakingWindow.cs
@@ -170,8 +170,8 @@ void InitializeBakingSetList()
                         m_RenameSelectedBakingSet = false;
 
                         // Rename profile asset to match name:
-                        set.profile.name = set.name;
                         AssetDatabase.RenameAsset(AssetDatabase.GetAssetPath(set.profile), set.name);
+                        set.profile.name = set.name;
                     }
                 }
                 else
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index 552ffb6ed3f..0a44f7a6854 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -74,6 +74,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed errors spamming when in player mode due to ray tracing light cluster debug view (case 1390471).
 - Fixed warning upon deleting APV data assets.
 - Fixed an issue in the instance ID management for tesselation shaders.
+- Fixed warning when an APV baking set is renamed.
 
 ## [14.0.0] - 2021-11-17