diff --git a/src/products/views/ProductCreate.tsx b/src/products/views/ProductCreate.tsx
index 030d7640c..18a45ab71 100644
--- a/src/products/views/ProductCreate.tsx
+++ b/src/products/views/ProductCreate.tsx
@@ -10,7 +10,7 @@ import { useWarehouseList } from "@saleor/warehouses/queries";
 import React from "react";
 import { useIntl } from "react-intl";
 
-import { decimal, maybe, weight } from "../../misc";
+import { decimal, weight } from "../../misc";
 import ProductCreatePage, {
   ProductCreatePageSubmitData
 } from "../components/ProductCreatePage";
@@ -107,14 +107,13 @@ export const ProductCreateView: React.FC = () => {
         })}
       />
       <ProductCreatePage
-        currency={maybe(() => shop.defaultCurrency)}
-        categories={maybe(() => searchCategoryOpts.data.search.edges, []).map(
+        currency={shop?.defaultCurrency}
+        categories={(searchCategoryOpts.data?.search.edges || []).map(
+          edge => edge.node
+        )}
+        collections={(searchCollectionOpts.data?.search.edges || []).map(
           edge => edge.node
         )}
-        collections={maybe(
-          () => searchCollectionOpts.data.search.edges,
-          []
-        ).map(edge => edge.node)}
         disabled={productCreateOpts.loading}
         errors={productCreateOpts.data?.productCreate.errors || []}
         fetchCategories={searchCategory}
@@ -124,30 +123,24 @@ export const ProductCreateView: React.FC = () => {
           defaultMessage: "New Product",
           description: "page header"
         })}
-        productTypes={maybe(() =>
-          searchProductTypesOpts.data.search.edges.map(edge => edge.node)
+        productTypes={searchProductTypesOpts.data?.search.edges.map(
+          edge => edge.node
         )}
         onBack={handleBack}
         onSubmit={handleSubmit}
         saveButtonBarState={productCreateOpts.status}
         fetchMoreCategories={{
-          hasMore: maybe(
-            () => searchCategoryOpts.data.search.pageInfo.hasNextPage
-          ),
+          hasMore: searchCategoryOpts.data?.search.pageInfo.hasNextPage,
           loading: searchCategoryOpts.loading,
           onFetchMore: loadMoreCategories
         }}
         fetchMoreCollections={{
-          hasMore: maybe(
-            () => searchCollectionOpts.data.search.pageInfo.hasNextPage
-          ),
+          hasMore: searchCollectionOpts.data?.search.pageInfo.hasNextPage,
           loading: searchCollectionOpts.loading,
           onFetchMore: loadMoreCollections
         }}
         fetchMoreProductTypes={{
-          hasMore: maybe(
-            () => searchProductTypesOpts.data.search.pageInfo.hasNextPage
-          ),
+          hasMore: searchProductTypesOpts.data?.search.pageInfo.hasNextPage,
           loading: searchProductTypesOpts.loading,
           onFetchMore: loadMoreProductTypes
         }}
diff --git a/src/products/views/ProductVariant.tsx b/src/products/views/ProductVariant.tsx
index bd8308134..5b58d89bf 100644
--- a/src/products/views/ProductVariant.tsx
+++ b/src/products/views/ProductVariant.tsx
@@ -122,10 +122,7 @@ export const ProductVariant: React.FC<ProductUpdateProps> = ({
 
   const handleImageSelect = (id: string) => () => {
     if (variant) {
-      if (
-        variant.images &&
-        variant.images.map(image => image.id).indexOf(id) !== -1
-      ) {
+      if (variant?.images?.map(image => image.id).indexOf(id) !== -1) {
         unassignImage({
           variables: {
             imageId: id,