diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1156737ca..20d698e72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Fixed
 * Fix save all button behavior for affects table (`OSIDB-3664`)
 * Fix loss of focus and undesirable sorting on affects being edited (`OSIDB-3700`)
+* Fix CVSS not created for new affects on save (`OSIDB-3777`)
 
 ### Changed
 * Move notifications to left side (`OSIDB-3543`)
diff --git a/src/composables/useFlawAffectsModel.ts b/src/composables/useFlawAffectsModel.ts
index 51e08b97c..e55daf0d9 100644
--- a/src/composables/useFlawAffectsModel.ts
+++ b/src/composables/useFlawAffectsModel.ts
@@ -109,7 +109,7 @@ export function useFlawAffectsModel() {
   }
 
   function shouldUpsertAffectCvss(affect: ZodAffectType) {
-    return affectRhCvss3(affect)?.vector && didAffectCvssChange(affect);
+    return affectRhCvss3(affect)?.vector && (didAffectCvssChange(affect) || !affect.uuid);
   }
 
   async function removeAffects() {