diff --git a/TopSpace/DevTeam.js b/TopSpace/DevTeam.js
index 4f7507294..a45de2cdc 100644
--- a/TopSpace/DevTeam.js
+++ b/TopSpace/DevTeam.js
@@ -43,11 +43,12 @@ function newDevTeam() {
 
         if (storedTeams === null || storedTeams === "[]" || storedTeams === "") {
             window.TEAMS = "";
+            window.DEV_TEAM = "";
             label = NOT_FOUND;
         } else {
             storedTeams = JSON.parse(storedTeams)
             window.TEAMS = storedTeams;
-            window.DEV_TEAM = storedTeams[0].slug;
+            window.DEV_TEAM = storedTeams[sharedStatus.currentDevTeamIndex].slug;
             label = storedTeams[sharedStatus.currentDevTeamIndex].name;
         }