diff --git a/packages/peregrine/lib/talons/OrderHistoryPage/orderRow.gql.js b/packages/peregrine/lib/talons/OrderHistoryPage/orderRow.gql.js
index 34afed7f8c..f9dcebe428 100644
--- a/packages/peregrine/lib/talons/OrderHistoryPage/orderRow.gql.js
+++ b/packages/peregrine/lib/talons/OrderHistoryPage/orderRow.gql.js
@@ -11,7 +11,7 @@ export const GET_CONFIGURABLE_THUMBNAIL_SOURCE = gql`
 `;
 
 export const GET_PRODUCT_THUMBNAILS_BY_URL_KEY = gql`
-    query GetProductThumbnailsByURLKey($urlKeys: [String!]!) {
+    query GetProductThumbnailsByURLKey($urlKeys: [String]!) {
         products(filter: { url_key: { in: $urlKeys } }) {
             # eslint-disable-next-line @graphql-eslint/require-id-when-available
             items {
diff --git a/packages/venia-ui/lib/components/OrderHistoryPage/collapsedImageGallery.js b/packages/venia-ui/lib/components/OrderHistoryPage/collapsedImageGallery.js
index 8e0fdbca96..14707d0d5e 100644
--- a/packages/venia-ui/lib/components/OrderHistoryPage/collapsedImageGallery.js
+++ b/packages/venia-ui/lib/components/OrderHistoryPage/collapsedImageGallery.js
@@ -19,6 +19,9 @@ const CollapsedImageGallery = props => {
             const baseImageElements = Object.values(items)
                 .slice(0, DISPLAY_COUNT)
                 .map((item, index) => {
+                    if (!item) {
+                        return null;
+                    }
                     const { thumbnail, name } = item;
                     const { url } = thumbnail;