diff --git a/src/containers/Sales/Estimates/EstimatesLanding/components.js b/src/containers/Sales/Estimates/EstimatesLanding/components.js
index 65b941d71..dc58b244c 100644
--- a/src/containers/Sales/Estimates/EstimatesLanding/components.js
+++ b/src/containers/Sales/Estimates/EstimatesLanding/components.js
@@ -83,11 +83,13 @@ export function ActionsMenu({
           text={intl.get('edit_estimate')}
           onClick={safeCallback(onEdit, original)}
         />
-        <MenuItem
-          icon={<Icon icon="convert_to" />}
-          text={intl.get('convert_to_invoice')}
-          onClick={safeCallback(onConvert, original)}
-        />
+        <If condition={!original.is_converted_to_invoice}>
+          <MenuItem
+            icon={<Icon icon="convert_to" />}
+            text={intl.get('convert_to_invoice')}
+            onClick={safeCallback(onConvert, original)}
+          />
+        </If>
 
         <If condition={!original.is_delivered}>
           <MenuItem
diff --git a/src/hooks/query/invoices.js b/src/hooks/query/invoices.js
index 1223210a9..39513148b 100644
--- a/src/hooks/query/invoices.js
+++ b/src/hooks/query/invoices.js
@@ -48,6 +48,10 @@ export function useCreateInvoice(props) {
       // Invalidate invoice customer.
       queryClient.invalidateQueries([t.CUSTOMER, values.customer_id]);
 
+      // Invalidate estimates.
+      queryClient.invalidateQueries(t.SALE_ESTIMATES);
+      queryClient.invalidateQueries(t.SALE_ESTIMATE);
+
       // Common invalidate queries.
       commonInvalidateQueries(queryClient);
     },
@@ -92,6 +96,10 @@ export function useDeleteInvoice(props) {
       // Invalidate specific invoice.
       queryClient.invalidateQueries([t.SALE_INVOICE, id]);
 
+      // Invalidate estimates.
+      queryClient.invalidateQueries(t.SALE_ESTIMATES);
+      queryClient.invalidateQueries(t.SALE_ESTIMATE);
+
       // Common invalidate queries.
       commonInvalidateQueries(queryClient);
     },