diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c
index f26bf10..428090c 100644
--- a/right/src/slave_scheduler.c
+++ b/right/src/slave_scheduler.c
@@ -42,9 +42,8 @@ static void masterCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t
             currentSlave->isConnected = true;
         }
 
-        previousSlaveId = currentSlaveId;
         if (currentStatus != kStatus_Uhk_NoTransfer) {
-            currentSlaveId++;
+            previousSlaveId = currentSlaveId++;
         }
 
         if (currentSlaveId >= (sizeof(Slaves) / sizeof(uhk_slave_t))) {