diff --git a/src/orders/types/InvoiceErrorFragment.ts b/src/fragments/types/InvoiceErrorFragment.ts
similarity index 100%
rename from src/orders/types/InvoiceErrorFragment.ts
rename to src/fragments/types/InvoiceErrorFragment.ts
diff --git a/src/orders/types/InvoiceFragment.ts b/src/fragments/types/InvoiceFragment.ts
similarity index 100%
rename from src/orders/types/InvoiceFragment.ts
rename to src/fragments/types/InvoiceFragment.ts
diff --git a/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx b/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx
index 2f9ff6456..639c79e94 100644
--- a/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx
+++ b/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx
@@ -8,9 +8,9 @@ import ConfirmButton, {
   ConfirmButtonTransitionState
 } from "@saleor/components/ConfirmButton";
 import FormSpacer from "@saleor/components/FormSpacer";
+import { InvoiceErrorFragment } from "@saleor/fragments/types/InvoiceErrorFragment";
+import { InvoiceFragment } from "@saleor/fragments/types/InvoiceFragment";
 import { buttonMessages } from "@saleor/intl";
-import { InvoiceErrorFragment } from "@saleor/orders/types/InvoiceErrorFragment";
-import { InvoiceFragment } from "@saleor/orders/types/InvoiceFragment";
 import { DialogProps } from "@saleor/types";
 import getInvoiceErrorMessage from "@saleor/utils/errors/invoice";
 import React from "react";
diff --git a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
index c648e1535..c22bb9080 100644
--- a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
+++ b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
@@ -12,8 +12,8 @@ import Date from "@saleor/components/Date";
 import ResponsiveTable from "@saleor/components/ResponsiveTable";
 import Skeleton from "@saleor/components/Skeleton";
 import TableCellHeader from "@saleor/components/TableCellHeader";
+import { InvoiceFragment } from "@saleor/fragments/types/InvoiceFragment";
 import { buttonMessages } from "@saleor/intl";
-import { InvoiceFragment } from "@saleor/orders/types/InvoiceFragment";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
diff --git a/src/orders/fixtures.ts b/src/orders/fixtures.ts
index 006e61c84..f992a15fc 100644
--- a/src/orders/fixtures.ts
+++ b/src/orders/fixtures.ts
@@ -1,3 +1,4 @@
+import { InvoiceFragment } from "@saleor/fragments/types/InvoiceFragment";
 import { SearchCustomers_search_edges_node } from "@saleor/searches/types/SearchCustomers";
 import { warehouseList } from "@saleor/warehouses/fixtures";
 import { MessageDescriptor } from "react-intl";
@@ -11,7 +12,6 @@ import {
   OrderStatus,
   PaymentChargeStatusEnum
 } from "../types/globalTypes";
-import { InvoiceFragment } from "./types/InvoiceFragment";
 import { OrderDetails_order } from "./types/OrderDetails";
 import { OrderList_orders_edges_node } from "./types/OrderList";
 import { SearchOrderVariant_search_edges_node } from "./types/SearchOrderVariant";
diff --git a/src/orders/mutations.ts b/src/orders/mutations.ts
index 8c2f32993..70253553d 100644
--- a/src/orders/mutations.ts
+++ b/src/orders/mutations.ts
@@ -472,6 +472,12 @@ const invoiceRequestMutation = gql`
       invoice {
         ...InvoiceFragment
       }
+      order {
+        id
+        invoices {
+          ...InvoiceFragment
+        }
+      }
     }
   }
 `;
diff --git a/src/utils/errors/invoice.ts b/src/utils/errors/invoice.ts
index 5eba61df9..48ab9dd1a 100644
--- a/src/utils/errors/invoice.ts
+++ b/src/utils/errors/invoice.ts
@@ -1,5 +1,5 @@
+import { InvoiceErrorFragment } from "@saleor/fragments/types/InvoiceErrorFragment";
 import { commonMessages } from "@saleor/intl";
-import { InvoiceErrorFragment } from "@saleor/orders/types/InvoiceErrorFragment";
 import { InvoiceErrorCode } from "@saleor/types/globalTypes";
 import { defineMessages, IntlShape } from "react-intl";