diff --git a/feature/waiting/src/main/kotlin/com/unifest/android/feature/waiting/component/WaitingInfoItem.kt b/feature/waiting/src/main/kotlin/com/unifest/android/feature/waiting/component/WaitingInfoItem.kt
index 972ab975..fc959092 100644
--- a/feature/waiting/src/main/kotlin/com/unifest/android/feature/waiting/component/WaitingInfoItem.kt
+++ b/feature/waiting/src/main/kotlin/com/unifest/android/feature/waiting/component/WaitingInfoItem.kt
@@ -108,7 +108,7 @@ fun WaitingInfoItem(
                             "CALLED" -> stringResource(id = R.string.waiting_my_turn)
                             else -> myWaitingModel.waitingOrder.toString()
                         },
-                        style = if (myWaitingModel.waitingOrder.toInt() == 1) WaitingNumber5 else WaitingNumber,
+                        style = if (myWaitingModel.status == "CALLED") WaitingNumber5 else WaitingNumber,
                         color = if (myWaitingModel.status == "NOSHOW") {
                             LightPrimary700
                         } else {
@@ -117,7 +117,7 @@ fun WaitingInfoItem(
                         modifier = Modifier.alignByBaseline(),
                     )
                     Spacer(modifier = Modifier.width(8.dp))
-                    if (myWaitingModel.waitingOrder.toInt() != 1 && myWaitingModel.status != "NOSHOW") {
+                    if (myWaitingModel.status != "CALLED" && myWaitingModel.status != "NOSHOW") {
                         Text(
                             text = stringResource(id = R.string.waiting_nth),
                             fontSize = 18.sp,