diff --git a/src/LoggedInHome.js b/src/LoggedInHome.js
index 891c82b..0faa5c8 100644
--- a/src/LoggedInHome.js
+++ b/src/LoggedInHome.js
@@ -128,18 +128,18 @@ export default withRouter(class LoggedInHome extends React.Component {
 
 			return Promise.all(userGroupsQuerySnapshot.docs.map((group) => {
 				const groupData = groupRef.doc(group.id).get().catch((error) => {
-					console.log(`Couldn't get group data: ${error}`);
+					console.log(`Couldn't get group data, possibly due to outdated cached data: ${error}`);
 					return true;
 				});
 
-				newState.user.groups.push(group.id);
-
 				return userGroupSetsRef
 					.where("public", "==", true)
 					.where("groups", "array-contains", group.id)
 					.get().then(async (userGroupSetsQuerySnapshot) => {
 						groupData.then((result) => {
 							if (typeof result !== "undefined" && typeof result.data === "function" && userGroupSetsQuerySnapshot.docs.length > 0) {
+								newState.user.groups.push(group.id);
+
 								userGroupSets.push({
 									group: result,
 									sets: userGroupSetsQuerySnapshot.docs,
diff --git a/src/SetPage.js b/src/SetPage.js
index 86af3c2..0ca91eb 100644
--- a/src/SetPage.js
+++ b/src/SetPage.js
@@ -174,7 +174,8 @@ export default withRouter(class SetPage extends React.Component {
 							.then((groupDoc) => {
 								newState.groups[userGroupDoc.id] = groupDoc.data().display_name;
 								newState.addSetToGroupLoading[userGroupDoc.id] = false;
-							});
+							})
+							.catch((err) => console.log(`Can't get group, possibly due to outdated cached data: ${err}`));
 					return true;
 				}));
 			})