diff --git a/src/client/stores/CalculationStore/Effects/reaction.ts b/src/client/stores/CalculationStore/Effects/reaction.ts
index b7b4670..e93634d 100644
--- a/src/client/stores/CalculationStore/Effects/reaction.ts
+++ b/src/client/stores/CalculationStore/Effects/reaction.ts
@@ -1323,14 +1323,14 @@ const reactionEffects: IReactionEffect[] = [
               calculationStore.setStatus('selectModel', Status.Default);
               calculationStore.setOptions('selectModel', models);
               calculationStore.setValue('model', null);
+              return;
             }
           });
         }
-      } else {
-        calculationStore.setStatus('selectModel', Status.Disabled);
-        calculationStore.setOptions('selectModel', []);
-        calculationStore.setValue('model', null);
       }
+      calculationStore.setStatus('selectModel', Status.Disabled);
+      calculationStore.setOptions('selectModel', []);
+      calculationStore.setValue('model', null);
     },
   }),
 
@@ -1356,14 +1356,14 @@ const reactionEffects: IReactionEffect[] = [
               calculationStore.setStatus('selectConfiguration', Status.Default);
               calculationStore.setOptions('selectConfiguration', equipments);
               calculationStore.setValue('configuration', null);
+              return;
             }
           });
         }
-      } else {
-        calculationStore.setStatus('selectConfiguration', Status.Disabled);
-        calculationStore.setOptions('selectConfiguration', []);
-        calculationStore.setValue('configuration', null);
       }
+      calculationStore.setStatus('selectConfiguration', Status.Disabled);
+      calculationStore.setOptions('selectConfiguration', []);
+      calculationStore.setValue('configuration', null);
     },
   }),