diff --git a/src/os/shared/src/osapi-idmap.c b/src/os/shared/src/osapi-idmap.c
index d75df4be0..b2c840feb 100644
--- a/src/os/shared/src/osapi-idmap.c
+++ b/src/os/shared/src/osapi-idmap.c
@@ -622,7 +622,8 @@ int32 OS_ObjectIdFindNextFree(OS_object_token_t *token)
 
     for (i = 0; i < max_id; ++i)
     {
-        local_id = (++serial) % max_id;
+        serial++;
+        local_id = (serial) % max_id;
         if (serial >= OS_OBJECT_INDEX_MASK)
         {
             /* reset to beginning of ID space */