diff --git a/resources/frontend_client/app/home/components/Activity.react.js b/resources/frontend_client/app/home/components/Activity.react.js
index d5db74d26408a58c075c0967b4441b1bbe06545b..5de0a4ab1d3d301004995ee63ef8b44b59f62852 100644
--- a/resources/frontend_client/app/home/components/Activity.react.js
+++ b/resources/frontend_client/app/home/components/Activity.react.js
@@ -53,9 +53,16 @@ export default class Activity extends Component {
                 // assign the user a color
                 if (item.user_id === user.id) {
                     userColors[item.user_id] = 0;
+                } else if (item.user_id === null) {
+                    // just skip this scenario, we handle this differently
                 } else {
                     userColors[item.user_id] = colors[currColor];
                     currColor++;
+
+                    // if we hit the end of the colors list then just go back to the beginning again
+                    if (currColor >= colors.length) {
+                        currColor = 0;
+                    }
                 }
             }
         }