diff --git a/src/components/active-invoice/index.tsx b/src/components/active-invoice/index.tsx
index 85a3f92..3222f7c 100644
--- a/src/components/active-invoice/index.tsx
+++ b/src/components/active-invoice/index.tsx
@@ -71,7 +71,14 @@ export default function ActiveInvoice({ invoice }: { invoice: Invoice }) {
           {invoiceCost(invoice.tasks)}
         </p>
         {client && user?.email === 'nick.braica@gmail.com' && (
-          <Button onClick={() => {}} style="inline" icon={IconDownload}>
+          <Button
+            onClick={() => {}}
+            style="inline"
+            icon={IconDownload}
+            key={invoice.tasks
+              .map((task) => task.description.replace(' ', ''))
+              .join('')}
+          >
             <PDFDownloadLink
               document={<InvoicePdf invoice={invoice} client={client} />}
               fileName={`invoice-${invoice.number.toLowerCase()}-${dateFormatterFilename(invoice.issueDate)}.pdf`}
diff --git a/src/components/edit-invoice-form/index.tsx b/src/components/edit-invoice-form/index.tsx
index ac0e6e5..2acd8ca 100644
--- a/src/components/edit-invoice-form/index.tsx
+++ b/src/components/edit-invoice-form/index.tsx
@@ -65,6 +65,7 @@ export default function EditInvoiceForm({
     try {
       const newData: Invoice = {
         ...invoice,
+        number: invoiceNumber,
         issueDate,
         dueDate,
         description,