diff --git a/src/components/ImportRunnerModal.svelte b/src/components/ImportRunnerModal.svelte
index b2b8e4b7..f5df9e1e 100644
--- a/src/components/ImportRunnerModal.svelte
+++ b/src/components/ImportRunnerModal.svelte
@@ -43,7 +43,7 @@
     teams = val;
   });
   let selected_org;
-  let selected_org_or_team;
+  $: selected_org_or_team = "";
   let files;
   let recent_processed = true;
   $: json_output = [];
@@ -303,7 +303,7 @@
                           class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
                           {$_('csv_import__lastname')}
                         </th>
-                        {#if opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview'}
+                        {#if (opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview') || (opened_from === 'RunnerOverview' && selected_org_or_team.includes('ORG_'))}
                           <th
                             scope="col"
                             class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
@@ -328,7 +328,7 @@
                             <td class="px-6 py-4 whitespace-nowrap">
                               {runner[`${$_('csv_import__lastname')}`]}
                             </td>
-                            {#if opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview'}
+                            {#if (opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview') || (opened_from === 'RunnerOverview' && selected_org_or_team.includes('ORG_'))}
                               <td class="px-6 py-4 whitespace-nowrap">
                                 {runner[`${$_('csv_import__team')}`] || runner[`${$_('csv_import__class')}`] || '---'}
                               </td>