diff --git a/components/HomeSection/Assets.gql b/components/HomeSection/Assets.gql
index f1f99f4b..91dd237f 100644
--- a/components/HomeSection/Assets.gql
+++ b/components/HomeSection/Assets.gql
@@ -83,6 +83,9 @@ query FetchAssets(
             decimals
             symbol
           }
+          maker {
+            address
+          }
         }
       }
     }
diff --git a/components/Sales/Direct/CardFooter.tsx b/components/Sales/Direct/CardFooter.tsx
index de10bc27..f523d7ed 100644
--- a/components/Sales/Direct/CardFooter.tsx
+++ b/components/Sales/Direct/CardFooter.tsx
@@ -1,6 +1,8 @@
 import { Divider, Flex, HStack, Text } from '@chakra-ui/react'
 import useTranslation from 'next-translate/useTranslation'
 import { FC, useMemo } from 'react'
+import useAccount from '../../../hooks/useAccount'
+import { isSameAddress } from '../../../utils'
 import AddToCartButton from '../../Button/AddToCart'
 import Link from '../../Link/Link'
 import Price from '../../Price/Price'
@@ -13,10 +15,12 @@ type Props = {
       decimals: number
       symbol: string
     }
+    maker: {
+      address: string
+    }
   }
   numberOfSales: number
   hasMultiCurrency: boolean
-  isOwner: boolean
   showButton?: boolean
 }
 
@@ -24,10 +28,18 @@ const SaleDirectCardFooter: FC<Props> = ({
   sale,
   numberOfSales,
   hasMultiCurrency,
-  isOwner,
   showButton = true,
 }) => {
   const { t } = useTranslation('components')
+  const { address } = useAccount()
+
+  // TODO: we should have a modal if there is more than one sale like we have on detail page
+  // issue is tracked on https://github.com/liteflow-labs/starter-kit/issues/529 for this modal improvement
+  const isOwner = useMemo(
+    () => (address ? isSameAddress(sale.maker.address, address) : false),
+    [address, sale.maker],
+  )
+
   const chip = useMemo(() => {
     switch (numberOfSales) {
       case 0:
@@ -94,7 +106,7 @@ const SaleDirectCardFooter: FC<Props> = ({
             : chip}
         </Text>
       </Flex>
-      {showButton && (
+      {showButton && address && (
         <>
           <Divider orientation="vertical" />
           <AddToCartButton
diff --git a/components/Token/Card.tsx b/components/Token/Card.tsx
index 56802561..18cdc117 100644
--- a/components/Token/Card.tsx
+++ b/components/Token/Card.tsx
@@ -72,6 +72,9 @@ export type Props = {
               decimals: number
               symbol: string
             }
+            maker: {
+              address: string
+            }
           }[]
         }
       | undefined
@@ -107,7 +110,6 @@ const TokenCard: FC<Props> = ({ asset }) => {
           sale={sale}
           numberOfSales={numberOfSales}
           hasMultiCurrency={hasMultiCurrency}
-          isOwner={isOwner}
           showButton={isHovered}
         />
       )
diff --git a/pages/checkout/[id].gql b/pages/checkout/[id].gql
index 2f8bb361..0665fa36 100644
--- a/pages/checkout/[id].gql
+++ b/pages/checkout/[id].gql
@@ -63,6 +63,9 @@ query Checkout($id: UUID!, $address: Address, $now: Datetime!) {
             decimals
             symbol
           }
+          maker {
+            address
+          }
         }
       }
     }
diff --git a/pages/collection/[chainId]/[id]/index.gql b/pages/collection/[chainId]/[id]/index.gql
index ed1ef3dd..c5cc3e2c 100644
--- a/pages/collection/[chainId]/[id]/index.gql
+++ b/pages/collection/[chainId]/[id]/index.gql
@@ -136,6 +136,9 @@ query FetchCollectionAssets(
             decimals
             symbol
           }
+          maker {
+            address
+          }
         }
       }
     }
diff --git a/pages/explore/explore.gql b/pages/explore/explore.gql
index 891322c7..570b68ff 100644
--- a/pages/explore/explore.gql
+++ b/pages/explore/explore.gql
@@ -68,6 +68,9 @@ query FetchAllERC721And1155(
             decimals
             symbol
           }
+          maker {
+            address
+          }
         }
       }
       creator {
diff --git a/pages/tokens/[id]/bid.gql b/pages/tokens/[id]/bid.gql
index 079992c8..633db930 100644
--- a/pages/tokens/[id]/bid.gql
+++ b/pages/tokens/[id]/bid.gql
@@ -70,6 +70,9 @@ query BidOnAsset(
           decimals
           symbol
         }
+        maker {
+          address
+        }
       }
     }
     ownerships(first: 1) {
diff --git a/pages/tokens/[id]/offer.gql b/pages/tokens/[id]/offer.gql
index f2af14da..5806d4e9 100644
--- a/pages/tokens/[id]/offer.gql
+++ b/pages/tokens/[id]/offer.gql
@@ -65,6 +65,9 @@ query OfferForAsset(
           decimals
           symbol
         }
+        maker {
+          address
+        }
       }
     }
     creator {
diff --git a/pages/users/[id]/assetDetail.gql b/pages/users/[id]/assetDetail.gql
index 2061f65a..cda3dd4a 100644
--- a/pages/users/[id]/assetDetail.gql
+++ b/pages/users/[id]/assetDetail.gql
@@ -48,6 +48,9 @@ fragment AssetDetail on Asset {
         decimals
         symbol
       }
+      maker {
+        address
+      }
     }
   }
   creator {