diff --git a/src/pages/team/CreateInvoice.jsx b/src/pages/team/CreateInvoice.jsx
index 64ecf6d..eca076b 100644
--- a/src/pages/team/CreateInvoice.jsx
+++ b/src/pages/team/CreateInvoice.jsx
@@ -108,7 +108,7 @@ export default function CreateInvoice() {
       await supabase.from('tasks').update({ invoiced: true }).in('id', taskIds);
     }
 
-    navigate(`/invoices/${invoice.id}`);
+    navigate(`/invoices/${invoice.id}`, { state: { invoice } });
   };
 
   const selectedCompany = companies.find(c => c.id === selectedCompanyId);
diff --git a/src/pages/team/InvoiceDetail.jsx b/src/pages/team/InvoiceDetail.jsx
index f3338b5..5444cfc 100644
--- a/src/pages/team/InvoiceDetail.jsx
+++ b/src/pages/team/InvoiceDetail.jsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { useParams, useNavigate, Link } from 'react-router-dom';
+import { useParams, useNavigate, useLocation, Link } from 'react-router-dom';
 import Layout from '../../components/Layout';
 import { supabase } from '../../lib/supabase';
 import { generateInvoicePDF } from '../../lib/invoice';
@@ -9,8 +9,9 @@ const statusColor = { draft: 'not_started', sent: 'in_progress', paid: 'client_a
 export default function InvoiceDetail() {
   const { id } = useParams();
   const navigate = useNavigate();
+  const { state } = useLocation();
 
-  const [invoice, setInvoice] = useState(null);
+  const [invoice, setInvoice] = useState(state?.invoice || null);
   const [company, setCompany] = useState(null);
   const [items, setItems] = useState([]);
   const [loading, setLoading] = useState(true);