diff --git a/src/components/reviews/ReviewForm.tsx b/src/components/reviews/ReviewForm.tsx
index 70107e84..2f9ae68b 100644
--- a/src/components/reviews/ReviewForm.tsx
+++ b/src/components/reviews/ReviewForm.tsx
@@ -189,7 +189,8 @@ export function ReviewForm({
           {entityType === 'ride' && <div className="space-y-2">
               <Label htmlFor="wait_time">Wait Time (minutes)</Label>
               <Input id="wait_time" type="number" min="0" placeholder="How long did you wait?" {...register('wait_time_minutes', {
-            valueAsNumber: true
+            valueAsNumber: true,
+            setValueAs: (v) => v === '' || isNaN(v) ? undefined : v
           })} />
             </div>}
 
diff --git a/src/components/reviews/ReviewsList.tsx b/src/components/reviews/ReviewsList.tsx
index 6d2441e3..38a3eca7 100644
--- a/src/components/reviews/ReviewsList.tsx
+++ b/src/components/reviews/ReviewsList.tsx
@@ -49,7 +49,7 @@ export function ReviewsList({ entityType, entityId, entityName }: ReviewsListPro
         .from('reviews')
         .select(`
           *,
-          profiles:user_id(username, avatar_url, display_name)
+          profiles!reviews_user_id_fkey(username, avatar_url, display_name)
         `)
         .eq('moderation_status', 'approved')
         .order('created_at', { ascending: false });