diff --git a/src/components/RunnersOverview.svelte b/src/components/RunnersOverview.svelte
index bf84213d..8b4cbb3f 100644
--- a/src/components/RunnersOverview.svelte
+++ b/src/components/RunnersOverview.svelte
@@ -86,7 +86,16 @@
                     {/if}
                   </td>
                   <td class="px-6 py-4 whitespace-nowrap">
-                    {runner.group.name}
+                    {#if runner.group.responseType === 'RUNNERTEAM'}
+                      <a
+                        href="../teams/1"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.name}</a>
+                    {/if}
+                    {#if runner.group.responseType === 'RUNNERORGANIZATION'}
+                      <a
+                        href="../orgs/1"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.name}</a>
+                    {/if}
                   </td>
                   <td class="px-6 py-4 whitespace-nowrap">{runner.distance}</td>
                   {#if active_deletes[runner.id] === true}