diff --git a/src/components/runners/ImportRunnerModal.svelte b/src/components/runners/ImportRunnerModal.svelte
index e17944bc..1333134a 100644
--- a/src/components/runners/ImportRunnerModal.svelte
+++ b/src/components/runners/ImportRunnerModal.svelte
@@ -45,9 +45,12 @@
   let teams = [];
   RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
     teams = val;
-    if (opened_from === "RunnerOverview") {
+    if (opened_from === "RunnerOverview" && teams.length>0) {
       selected_org_or_team = "TEAM_" + teams[0].id;
     }
+    if(teams.length==0 && orgs.length>0){
+      selected_org_or_team = "ORG_" + orgs[0].id
+    }
   });
   let selected_org;
   $: selected_org_or_team = "";