diff --git a/src/commons/assessmentWorkspace/AssessmentWorkspace.tsx b/src/commons/assessmentWorkspace/AssessmentWorkspace.tsx
index bb5b9b79a8..adbe92f7de 100644
--- a/src/commons/assessmentWorkspace/AssessmentWorkspace.tsx
+++ b/src/commons/assessmentWorkspace/AssessmentWorkspace.tsx
@@ -191,9 +191,10 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
   }, []);
 
   useEffect(() => {
-    handleTeamOverviewFetch(props.assessmentId);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+    if (assessmentOverview && assessmentOverview.maxTeamSize > 1) {
+      handleTeamOverviewFetch(props.assessmentId);
+    }
+  }, [assessmentOverview, handleTeamOverviewFetch, props.assessmentId]);
 
   /**
    * After mounting (either an older copy of the assessment
diff --git a/src/pages/achievement/control/AchievementControl.tsx b/src/pages/achievement/control/AchievementControl.tsx
index caf60cfa54..581d9974a4 100644
--- a/src/pages/achievement/control/AchievementControl.tsx
+++ b/src/pages/achievement/control/AchievementControl.tsx
@@ -35,18 +35,13 @@ const AchievementControl: React.FC = () => {
     [dispatch]
   );
 
-  // TODO: This is a hacky fix. By right, we shouldn't need to use an
-  // inferencer instance since we can encapsulate the logic using hooks
-  // and component state.
   const [initialAchievements, initialGoals] = useTypedSelector(state => [
     state.achievement.achievements,
     state.achievement.goals
   ]);
   const inferencer = useMemo(
     () => new AchievementInferencer(initialAchievements, initialGoals),
-    // We only want to create the inferencer once
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
+    [initialAchievements, initialGoals]
   );
 
   /**