diff --git a/src/containers/ExercisesListContainer/ExercisesListContainer.js b/src/containers/ExercisesListContainer/ExercisesListContainer.js
index 4b83df82d..a64ddd244 100644
--- a/src/containers/ExercisesListContainer/ExercisesListContainer.js
+++ b/src/containers/ExercisesListContainer/ExercisesListContainer.js
@@ -46,7 +46,7 @@ const transformAndSetFilterData = defaultMemoize(
       if (rootGroup) {
         data.groupsIds = [rootGroup];
       }
-      if (tags.length > 0) {
+      if (tags && tags.length > 0) {
         data.tags = tags;
       }
 
diff --git a/src/pages/GroupDetail/GroupDetail.js b/src/pages/GroupDetail/GroupDetail.js
index 0f1a2fda9..9f5157cea 100644
--- a/src/pages/GroupDetail/GroupDetail.js
+++ b/src/pages/GroupDetail/GroupDetail.js
@@ -399,6 +399,7 @@ class GroupDetail extends Component {
                       isOpen
                       unlimitedHeight>
                       <ExercisesListContainer
+                        key={data.id /* this will force component reload if group is switched */}
                         id={`exercises-group-${data.id}`}
                         rootGroup={data.id}
                         showAssignButton={