diff --git a/src/store/index.js b/src/store/index.js
index 535bf224..e6789340 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -910,7 +910,8 @@ export const useMainStore = defineStore({
           );
         
         if (haveMoldingQuestionAnswersChanged) {
-          this.resetPartsAndDependencies();
+          this.updateGlassParts(null);
+          this.updateSupportingItems(null);
           this.updateCapabilityQuestionAnswers(null);
           this.updatePageData({ page: issPageValues.CAPABILITY_QUESTIONS, data: null });
         }
@@ -935,7 +936,8 @@ export const useMainStore = defineStore({
           );
         
         if (haveCapabilityQuestionAnswersChanged) {
-          this.resetPartsAndDependencies();
+          this.updateGlassParts(null);
+          this.updateSupportingItems(null);
         }
 
         // Save new values