diff --git a/components/Services/NftMint/NFTokenMint.js b/components/Services/NftMint/NFTokenMint.js
index b8805de2..2ee6def5 100644
--- a/components/Services/NftMint/NFTokenMint.js
+++ b/components/Services/NftMint/NFTokenMint.js
@@ -8,7 +8,7 @@ import ExpirationSelect from '../../UI/ExpirationSelect'
 import TokenSelector from '../../UI/TokenSelector'
 import { useRouter } from 'next/router'
 
-export default function NFTokenMint({ setSignRequest, uriQuery, taxonQuery }) {
+export default function NFTokenMint({ setSignRequest, uriQuery, taxonQuery, account }) {
   const router = useRouter()
   const [uri, setUri] = useState(uriQuery)
   const [agreeToSiteTerms, setAgreeToSiteTerms] = useState(false)
@@ -41,6 +41,13 @@ export default function NFTokenMint({ setSignRequest, uriQuery, taxonQuery }) {
     }
   }, [agreeToSiteTerms, agreeToPrivacyPolicy])
 
+
+  useEffect(() => {
+    if (!account?.address) {
+      setCreateSellOffer(false)
+    }
+  }, [account?.address])
+
   useEffect(() => {
     let queryAddList = []
     let queryRemoveList = []
@@ -337,9 +344,15 @@ export default function NFTokenMint({ setSignRequest, uriQuery, taxonQuery }) {
                   setCreateSellOffer(!createSellOffer)
                 }}
                 name="create-sell-offer"
+                disabled={!account?.address}
               >
                 Create a Sell offer
               </CheckBox>
+              {!account?.address && (
+                <div className="orange" style={{ marginTop: '5px', fontSize: '14px' }}>
+                  Login first if you want to add the sell offer in the same transaction.
+                </div>
+              )}
             </div>
 
             {/* Sell Offer Fields */}
diff --git a/pages/services/nft-mint.js b/pages/services/nft-mint.js
index 225d78b1..f6de2252 100644
--- a/pages/services/nft-mint.js
+++ b/pages/services/nft-mint.js
@@ -21,7 +21,7 @@ export const getServerSideProps = async (context) => {
   }
 }
 
-export default function NftMint({ setSignRequest, uriQuery, digestQuery, taxonQuery }) {
+export default function NftMint({ setSignRequest, uriQuery, digestQuery, taxonQuery, account }) {
   const { t } = useTranslation()
 
   return (
@@ -47,7 +47,7 @@ export default function NftMint({ setSignRequest, uriQuery, digestQuery, taxonQu
           {xahauNetwork ? (
             <URITokenMint setSignRequest={setSignRequest} uriQuery={uriQuery} digestQuery={digestQuery} />
           ) : (
-            <NFTokenMint setSignRequest={setSignRequest} uriQuery={uriQuery} taxonQuery={taxonQuery} />
+            <NFTokenMint setSignRequest={setSignRequest} uriQuery={uriQuery} taxonQuery={taxonQuery} account={account} />
           )}
         </div>
       </div>
diff --git a/pages/services/trustline.js b/pages/services/trustline.js
index ed4ac4fa..a7fc6481 100644
--- a/pages/services/trustline.js
+++ b/pages/services/trustline.js
@@ -63,6 +63,7 @@ export default function TrustSet({ setSignRequest }) {
         setIssuer(selectedToken.issuer)
       }
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selectedToken, mode])
 
   // Sync limit when switching modes