diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98598b1da3..c94aa0f975 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -275,7 +275,7 @@ workflows:
           filters:
             branches:
               only:
-                - gig-referrals
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
diff --git a/src/shared/actions/leaderboard.js b/src/shared/actions/leaderboard.js
index b379260372..7547b1cd4a 100644
--- a/src/shared/actions/leaderboard.js
+++ b/src/shared/actions/leaderboard.js
@@ -1,9 +1,8 @@
+/* eslint-disable no-param-reassign */
 /**
  * Leaderboard actions.
  */
 
-/* global fetch */ /* eslint no-param-reassign: ["error", { "props": false }] */
-
 import _ from 'lodash';
 import { createActions } from 'redux-actions';
 
@@ -34,10 +33,19 @@ function fetchLeaderboard(auth, apiUrl, id) {
     });
 }
 
+/**
+ * Prepare loading looker for TCO history modal
+ * @param {string} url the url to load data from
+ */
 function getTcoHistoryChallengesInit(url) {
   return _.toString(url);
 }
 
+/**
+ * Loads looker for TCO history modal
+ * @param {string} url the url to load data from
+ * @param {object} competitor the competitor data
+ */
 async function getTcoHistoryChallengesDone(url, competitor) {
   const res = await fetch(url)
     .then(response => response.json())
@@ -45,10 +53,13 @@ async function getTcoHistoryChallengesDone(url, competitor) {
       challenges: _.filter(jsonResponse, challenge => (
         challenge['member_profile_basic.user_id']
           ? (challenge['member_profile_basic.user_id'] === competitor['member_profile_basic.user_id'])
-          : (challenge.userid === competitor.userid)
+          : (challenge.userid === (competitor['member_profile_basic.user_id'] || competitor.userid))
       )),
     }));
-  return res;
+  return {
+    url,
+    challenges: res.challenges,
+  };
 }
 
 export default createActions({
diff --git a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
index f9e83ed626..2110e1fc1f 100644
--- a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
+++ b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
@@ -114,7 +114,7 @@ class ChallengeHistoryModal extends Component {
           <tbody>
             {
               challengesOrdered.map(challenge => (
-                <tr styleName="row" key={`${challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}`}>
+                <tr styleName="row" key={`${challenge['tco_leaderboard.challenge_id'] || challenge['challenge.challenge_id'] || challenge.challenge_id}`}>
                   <td styleName="name">
                     <a href={`${config.URL.BASE}/challenges/${challenge['tco_leaderboard.challenge_id'] || challenge['challenge.challenge_id'] || challenge.challenge_id}/`} styleName="link" target="_blank" rel="noopener noreferrer">
                       {challenge.challenge_name || challenge['challenge.challenge_name'] || challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}
@@ -136,6 +136,11 @@ class ChallengeHistoryModal extends Component {
         {
           loading ? <LoadingIndicator /> : null
         }
+        {
+          !challengesOrdered.length && !loading && (
+            <center><strong>No data available.</strong></center>
+          )
+        }
         <div styleName="buttons">
           <button onClick={onCancel} type="button" styleName="close-btn">
             Return to page
@@ -163,10 +168,11 @@ const CompetitorShape = PT.shape({
 ChallengeHistoryModal.defaultProps = {
   isCopilot: false,
   isAlgo: false,
+  challenges: [],
 };
 
 ChallengeHistoryModal.propTypes = {
-  challenges: CHALLENGES_TYPE.isRequired,
+  challenges: CHALLENGES_TYPE,
   competitor: CompetitorShape.isRequired,
   onCancel: PT.func.isRequired,
   loading: PT.bool.isRequired,
diff --git a/src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx b/src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx
index 38457a5a0f..0680acbe4f 100644
--- a/src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx
+++ b/src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx
@@ -14,7 +14,7 @@ function ChallengeHistoryModalContainer({
   isCopilot,
   isAlgo,
 }) {
-  if (!challenges.length) {
+  if (!challenges && !loading) {
     getChallengesHistory(dataUrl, competitor);
   }
 
@@ -32,8 +32,8 @@ function ChallengeHistoryModalContainer({
 
 ChallengeHistoryModalContainer.defaultProps = {
   dataUrl: 'http://www.mocky.io/v2/5bbec82f3400006e006fcba6?mocky-delay=5000ms',
-  challenges: [],
-  loading: true,
+  challenges: null,
+  loading: false,
   isCopilot: false,
   isAlgo: false,
 };
@@ -64,7 +64,7 @@ ChallengeHistoryModalContainer.propTypes = {
 };
 
 function mapStateToProps(state, ownProps) {
-  const { challenges, loading } = state.leaderboard;
+  const { challenges, loading } = state.leaderboard[ownProps.dataUrl] || {};
   return {
     challenges: ownProps.challenges || challenges,
     loading,
@@ -74,7 +74,7 @@ function mapStateToProps(state, ownProps) {
 function mapDispatchToProps(dispatch) {
   return {
     getChallengesHistory: (url, competitor) => {
-      dispatch(actions.leaderboard.getTcoHistoryChallengesInit());
+      dispatch(actions.leaderboard.getTcoHistoryChallengesInit(url));
       dispatch(actions.leaderboard.getTcoHistoryChallengesDone(url, competitor));
     },
   };
diff --git a/src/shared/reducers/leaderboard.js b/src/shared/reducers/leaderboard.js
index 1ba123d636..ddc7b89927 100644
--- a/src/shared/reducers/leaderboard.js
+++ b/src/shared/reducers/leaderboard.js
@@ -32,9 +32,11 @@ function onDone(state, action) {
 function onHistoryChallengesDone(state, action) {
   return {
     ...state,
-    challenges: action.error ? [] : action.payload.challenges,
-    failed: !!action.error,
-    loading: false,
+    [action.payload.url]: {
+      challenges: action.error ? [] : action.payload.challenges,
+      failed: !!action.error,
+      loading: false,
+    },
   };
 }
 
@@ -57,10 +59,12 @@ function create(initialState) {
       };
     },
     [actions.leaderboard.fetchLeaderboardDone]: onDone,
-    [actions.leaderboard.getTcoHistoryChallengesInit](state) {
+    [actions.leaderboard.getTcoHistoryChallengesInit](state, action) {
       return {
         ...state,
-        loading: true,
+        [action.payload]: {
+          loading: true,
+        },
       };
     },
     [actions.leaderboard.getTcoHistoryChallengesDone]: onHistoryChallengesDone,