diff --git a/lib/screens/add_exercise_screen.dart b/lib/screens/add_exercise_screen.dart
index 48249b0a..432c7033 100644
--- a/lib/screens/add_exercise_screen.dart
+++ b/lib/screens/add_exercise_screen.dart
@@ -156,14 +156,10 @@ class _BasicStepContent extends StatelessWidget {
               items: equipment,
               initialItems: addExerciseProvider.equipment,
               onChange: (dynamic entries) {
-                if (entries != null && entries.isNotEmpty) {
-                  addExerciseProvider.equipment = entries.cast<Equipment>();
-                }
+                addExerciseProvider.equipment = entries.cast<Equipment>();
               },
               onSaved: (dynamic entries) {
-                if (entries != null && entries.isNotEmpty) {
-                  addExerciseProvider.equipment = entries.cast<Equipment>();
-                }
+                addExerciseProvider.equipment = entries.cast<Equipment>();
               },
             ),
             AddExerciseMultiselectButton<Muscle>(
@@ -171,30 +167,23 @@ class _BasicStepContent extends StatelessWidget {
               items: muscles,
               initialItems: addExerciseProvider.primaryMuscles,
               onChange: (dynamic muscles) {
-                if (muscles != null && muscles.isNotEmpty) {
-                  addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
-                }
+                addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
               },
               onSaved: (dynamic muscles) {
-                if (muscles != null && muscles.isNotEmpty) {
-                  addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
-                }
+                addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
               },
             ),
             AddExerciseMultiselectButton<Muscle>(
-                title: AppLocalizations.of(context).musclesSecondary,
-                items: muscles,
-                initialItems: addExerciseProvider.secondaryMuscles,
-                onChange: (dynamic muscles) {
-                  if (muscles != null && muscles.isNotEmpty) {
-                    addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
-                  }
-                },
-                onSaved: (dynamic muscles) {
-                  if (muscles != null && muscles.isNotEmpty) {
-                    addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
-                  }
-                }),
+              title: AppLocalizations.of(context).musclesSecondary,
+              items: muscles,
+              initialItems: addExerciseProvider.secondaryMuscles,
+              onChange: (dynamic muscles) {
+                addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
+              },
+              onSaved: (dynamic muscles) {
+                addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
+              },
+            ),
             MuscleRowWidget(
               muscles: addExerciseProvider.primaryMuscles,
               musclesSecondary: addExerciseProvider.secondaryMuscles,
diff --git a/lib/widgets/add_exercise/add_exercise_multiselect_button.dart b/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
index af8d131a..86078f49 100644
--- a/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
+++ b/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
@@ -32,12 +32,10 @@ class _AddExerciseMultiselectButtonState<T> extends State<AddExerciseMultiselect
         onSaved: widget.onSaved,
         items: widget.items.map((item) => MultiSelectItem<T>(item, item.name)).toList(),
         onConfirm: (value) {
-          if (value.isNotEmpty) {
-            setState(() {
-              _selectedItems = value.cast<T>();
-              widget.onChange(_selectedItems);
-            });
-          }
+          setState(() {
+            _selectedItems = value.cast<T>();
+            widget.onChange(_selectedItems);
+          });
         },
         chipDisplay: MultiSelectChipDisplay(
           //scroll: true,