diff --git a/src/main/java/com/michelet/waiting/application/service/WaitingService.java b/src/main/java/com/michelet/waiting/application/service/WaitingService.java
index 0aad245..694b474 100644
--- a/src/main/java/com/michelet/waiting/application/service/WaitingService.java
+++ b/src/main/java/com/michelet/waiting/application/service/WaitingService.java
@@ -68,6 +68,12 @@ public WaitingResult enterWaiting(EnterWaitingCommand command) {
                     command.restaurantId(), waiting.getToken().value()
             );
 
+            if (position == null) {
+                Waiting updated = waitingRepository.findById(saved.getId())
+                        .orElseThrow(() -> new WaitingException(WaitingErrorCode.NOT_FOUND));
+                return WaitingResult.of(updated);
+            }
+
             return WaitingResult.of(saved, position);
 
         } catch (Exception e) {