diff --git a/src/client/components/booking-status-page.tsx b/src/client/components/booking-status-page.tsx
index 45ba6b2..7389126 100644
--- a/src/client/components/booking-status-page.tsx
+++ b/src/client/components/booking-status-page.tsx
@@ -59,18 +59,14 @@ export default function BookingStatusPage({ token }: BookingStatusPageProps) {
   const [cancellationResult, setCancellationResult] = useState<{ success: boolean; message: string; formattedDate?: string } | null>(null);
 
   // Fetch booking details
-  const { data: booking, isLoading, error, refetch } = useQuery({
-    queryKey: ["booking", "status", token],
-    // oRPC React Query Helper liefert .queryOptions()
-    ...queryClient.cancellation.getBookingByToken.queryOptions({ token }),
-    retry: false,
-  });
+  const { data: booking, isLoading, error, refetch } = useQuery(
+    queryClient.cancellation.getBookingByToken.queryOptions({ input: { token } })
+  );
 
   // Cancellation mutation
   const cancelMutation = useMutation({
-    // oRPC React Query Helper liefert .mutationOptions()
     ...queryClient.cancellation.cancelByToken.mutationOptions(),
-    onSuccess: (result) => {
+    onSuccess: (result: any) => {
       setCancellationResult({
         success: true,
         message: result.message,
@@ -92,7 +88,7 @@ export default function BookingStatusPage({ token }: BookingStatusPageProps) {
   const handleCancel = () => {
     setIsCancelling(true);
     setCancellationResult(null);
-    cancelMutation.mutate({ token });
+    cancelMutation.mutate({ input: { token } });
   };
 
   if (isLoading) {
diff --git a/src/server/rpc/bookings.ts b/src/server/rpc/bookings.ts
index 404aaf1..92bac68 100644
--- a/src/server/rpc/bookings.ts
+++ b/src/server/rpc/bookings.ts
@@ -13,7 +13,8 @@ import { validateEmail } from "@/server/lib/email-validator";
 
 // Create a server-side client to call other RPC endpoints
 const link = new RPCLink({ url: "http://localhost:5173/rpc" });
-const queryClient = createORPCClient<typeof rootRouter>(link);
+// Typisierung über any, um Build-Inkompatibilität mit NestedClient zu vermeiden (nur für interne Server-Calls)
+const queryClient = createORPCClient<any>(link);
 
 // Helper function to convert date from yyyy-mm-dd to dd.mm.yyyy
 function formatDateGerman(dateString: string): string {
@@ -149,7 +150,7 @@ const create = os
     // Notify customer: request received (pending)
     void (async () => {
       // Create booking access token for status viewing
-      const bookingAccessToken = await queryClient.cancellation.createToken({ bookingId: id });
+      const bookingAccessToken = await queryClient.cancellation.createToken({ input: { bookingId: id } });
       const bookingUrl = generateUrl(`/booking/${bookingAccessToken.token}`);
       
       const formattedDate = formatDateGerman(input.appointmentDate);
@@ -292,7 +293,7 @@ const updateStatus = os
     try {
       if (input.status === "confirmed") {
         // Create booking access token for this booking (status + cancellation)
-        const bookingAccessToken = await queryClient.cancellation.createToken({ bookingId: booking.id });
+        const bookingAccessToken = await queryClient.cancellation.createToken({ input: { bookingId: booking.id } });
         
         const formattedDate = formatDateGerman(booking.appointmentDate);
         const bookingUrl = generateUrl(`/booking/${bookingAccessToken.token}`);