diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c
index 13a06f4bfd..0b853df651 100644
--- a/sys/transceiver/transceiver.c
+++ b/sys/transceiver/transceiver.c
@@ -220,8 +220,8 @@ uint8_t transceiver_register(transceiver_type_t t, int pid)
     uint8_t i;
 
     /* find pid in registered threads or first unused space */
-    for (i = 0; ((reg[i].pid != pid) &&
-                (i < TRANSCEIVER_MAX_REGISTERED) &&
+    for (i = 0; ((i < TRANSCEIVER_MAX_REGISTERED) &&
+                (reg[i].pid != pid) &&
                 (reg[i].transceivers != TRANSCEIVER_NONE)); i++);
 
     if (i >= TRANSCEIVER_MAX_REGISTERED) {