diff --git a/src/containers/BackgroundTasks/tasks.ts b/src/containers/BackgroundTasks/tasks.ts
index 73efc35fa..a1adcdf27 100644
--- a/src/containers/BackgroundTasks/tasks.ts
+++ b/src/containers/BackgroundTasks/tasks.ts
@@ -99,6 +99,7 @@ export function queueInvoiceGenerate(
       onCompleted: data =>
         data.status === TaskStatus.SUCCESS
           ? notify({
+              status: "success",
               text: intl.formatMessage(messages.invoiceGenerateFinishedText),
               title: intl.formatMessage(messages.invoiceGenerateFinishedTitle)
             })
diff --git a/src/orders/mutations.ts b/src/orders/mutations.ts
index 71bf2763b..8c2f32993 100644
--- a/src/orders/mutations.ts
+++ b/src/orders/mutations.ts
@@ -5,7 +5,8 @@ import {
 } from "@saleor/fragments/errors";
 import {
   fragmentOrderDetails,
-  fragmentOrderEvent
+  fragmentOrderEvent,
+  invoiceFragment
 } from "@saleor/fragments/orders";
 import makeMutation from "@saleor/hooks/makeMutation";
 import gql from "graphql-tag";
@@ -490,12 +491,6 @@ const invoiceEmailSendMutation = gql`
       invoice {
         ...InvoiceFragment
       }
-      order {
-        id
-        invoices {
-          ...InvoiceFragment
-        }
-      }
     }
   }
 `;
diff --git a/src/orders/queries.ts b/src/orders/queries.ts
index df71b13c1..a0d227c23 100644
--- a/src/orders/queries.ts
+++ b/src/orders/queries.ts
@@ -1,5 +1,8 @@
 import { fragmentAddress } from "@saleor/fragments/address";
-import { fragmentOrderDetails } from "@saleor/fragments/orders";
+import {
+  fragmentOrderDetails,
+  invoiceFragment
+} from "@saleor/fragments/orders";
 import makeQuery from "@saleor/hooks/makeQuery";
 import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch";
 import gql from "graphql-tag";
diff --git a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
index 4d59363db..56b3112b8 100644
--- a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
+++ b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
@@ -276,6 +276,7 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
     const errs = data.invoiceRequest?.errors;
     if (errs.length === 0) {
       pushMessage({
+        status: "success",
         text: intl.formatMessage(messages.invoiceGenerateFinishedText),
         title: intl.formatMessage(messages.invoiceGenerateFinishedTitle)
       });