diff --git a/lib/providers/workout_plans.dart b/lib/providers/workout_plans.dart
index d9d393ee..145a274d 100644
--- a/lib/providers/workout_plans.dart
+++ b/lib/providers/workout_plans.dart
@@ -311,7 +311,6 @@ class WorkoutPlans extends WgerBaseProvider with ChangeNotifier {
   Future<Set> addSet(Set workoutSet) async {
     final data = await post(workoutSet.toJson(), makeUrl(_setsUrlPath));
     final set = Set.fromJson(data);
-    fetchComputedSettings(set);
     notifyListeners();
     return set;
   }
diff --git a/lib/widgets/workouts/forms.dart b/lib/widgets/workouts/forms.dart
index d0b1e694..600bba6b 100644
--- a/lib/widgets/workouts/forms.dart
+++ b/lib/widgets/workouts/forms.dart
@@ -383,13 +383,17 @@ class _SetFormWidgetState extends State<SetFormWidget> {
               for (var setting in widget._set.settings) {
                 setting.setId = setDb.id!;
                 setting.comment = '';
-                setting.repsText = 'temp text';
 
                 Setting settingDb = await workoutProvider.addSetting(setting);
+                setting.repsText = await workoutProvider.fetchSmartText(
+                  widget._set,
+                  setting.exerciseObj,
+                );
                 setting.id = settingDb.id;
               }
 
               // Add to workout day
+              workoutProvider.fetchComputedSettings(widget._set);
               widget._day.sets.add(widget._set);
 
               // Close the bottom sheet