diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/Guests.kt b/src/main/kotlin/com/android/trisolarisserver/controller/Guests.kt
index 89f0128..2db2484 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/Guests.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/Guests.kt
@@ -93,6 +93,17 @@ class Guests(
         return guests.toResponse(propertyId, guestVehicleRepo, guestRatingRepo)
     }
 
+    @GetMapping("/{guestId}")
+    fun getGuest(
+        @PathVariable propertyId: UUID,
+        @PathVariable guestId: UUID,
+        @AuthenticationPrincipal principal: MyPrincipal?
+    ): GuestResponse {
+        requireMember(propertyAccess, propertyId, principal)
+        val (_, guest) = requirePropertyGuest(propertyRepo, guestRepo, propertyId, guestId)
+        return setOf(guest).toResponse(propertyId, guestVehicleRepo, guestRatingRepo).first()
+    }
+
     @PostMapping("/{guestId}/vehicles")
     @ResponseStatus(HttpStatus.CREATED)
     fun addVehicle(