diff --git a/plugins/edsm.py b/plugins/edsm.py
index 32400c30..9519d83f 100644
--- a/plugins/edsm.py
+++ b/plugins/edsm.py
@@ -333,12 +333,9 @@ def credentials(cmdr: str) -> Optional[Tuple[str, str]]:
             and (edsm_apikeys := config.get_list('edsm_apikeys'))):
         idx = cmdrs.index(cmdr)
         # The EDSM cmdr and apikey might not exist yet!
-        if idx >= len(edsm_usernames):
+        if idx >= len(edsm_usernames) or idx >= len(edsm_apikeys):
             return None
 
-        if idx >= len(edsm_apikeys):
-            edsm_apikeys[idx] = None
-
         return (edsm_usernames[idx], edsm_apikeys[idx])
 
     else: