diff --git a/src/java/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java b/src/java/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java
index 7833f4a924..0f6767c8bb 100644
--- a/src/java/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java
+++ b/src/java/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java
@@ -409,7 +409,7 @@ public static int findSystemIdByImei(String imei) {
             if (imcSys == null) {
                 return vt.getImcId().intValue();
             }
-            return ImcId16.NULL_ID.intValue();
+            return imcSys.getId().intValue();
         }
 
         public byte[] messageRaw() {