diff --git a/susconecta/app/(main-routes)/consultas/page.tsx b/susconecta/app/(main-routes)/consultas/page.tsx
index c33a1dc..ce70143 100644
--- a/susconecta/app/(main-routes)/consultas/page.tsx
+++ b/susconecta/app/(main-routes)/consultas/page.tsx
@@ -423,7 +423,8 @@ export default function ConsultasPage() {
           <p className="text-muted-foreground">Visualize, filtre e gerencie todas as consultas da clínica.</p>
         </div>
         <div className="flex items-center gap-2">
-          <Link href="/agenda">
+          {/* Pass origin so the Agenda page can return to Consultas when cancelling */}
+          <Link href="/agenda?origin=consultas">
             <Button size="sm" className="h-8 gap-1 bg-blue-600">
               <PlusCircle className="h-3.5 w-3.5" />
               <span className="sr-only sm:not-sr-only sm:whitespace-nowrap">Agendar Nova Consulta</span>
diff --git a/susconecta/app/agenda/page.tsx b/susconecta/app/agenda/page.tsx
index dc02f92..2a88845 100644
--- a/susconecta/app/agenda/page.tsx
+++ b/susconecta/app/agenda/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useRouter } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { CalendarRegistrationForm } from "@/components/forms/calendar-registration-form";
 import HeaderAgenda from "@/components/agenda/HeaderAgenda";
 import FooterAgenda from "@/components/agenda/FooterAgenda";
@@ -10,6 +10,8 @@ import { toast } from '@/hooks/use-toast';
 
 interface FormData {
   patientName?: string;
+  patientId?: string;
+  doctorId?: string;
   cpf?: string;
   rg?: string;
   birthDate?: string;
@@ -28,10 +30,15 @@ interface FormData {
   requestingProfessional?: string;
   appointmentType?: string;
   notes?: string;
+  duration_minutes?: number;
+  chief_complaint?: string | null;
+  patient_notes?: string | null;
+  insurance_provider?: string | null;
 }
 
 export default function NovoAgendamentoPage() {
   const router = useRouter();
+  const searchParams = useSearchParams();
   const [formData, setFormData] = useState<FormData>({});
 
   const handleFormChange = (data: FormData) => {
@@ -69,6 +76,16 @@ export default function NovoAgendamentoPage() {
   };
 
   const handleCancel = () => {
+    // If origin was provided (eg: consultas), return there. Default to calendar.
+    try {
+      const origin = searchParams?.get?.('origin');
+      if (origin === 'consultas') {
+        router.push('/consultas');
+        return;
+      }
+    } catch (e) {
+      // fallback
+    }
     router.push("/calendar");
   };
 
@@ -77,8 +94,8 @@ export default function NovoAgendamentoPage() {
       <HeaderAgenda />
       <main className="flex-1 mx-auto w-full max-w-7xl px-8 py-8">
     <CalendarRegistrationForm 
-      formData={formData} 
-      onFormChange={handleFormChange} 
+      formData={formData as any} 
+      onFormChange={handleFormChange as any} 
       createMode
     />
       </main>