diff --git a/package-lock.json b/package-lock.json
index e169e089..780131c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@aleph-sdk/core": "^1.2.0",
         "@aleph-sdk/ethereum": "^1.2.0",
         "@aleph-sdk/evm": "^1.2.0",
-        "@aleph-sdk/message": "^1.3.0",
+        "@aleph-sdk/message": "^1.3.1",
         "@aleph-sdk/solana": "^1.2.1",
         "@aleph-sdk/superfluid": "^1.2.0",
         "@fortawesome/fontawesome-svg-core": "^6.3.0",
@@ -234,9 +234,9 @@
       }
     },
     "node_modules/@aleph-sdk/message": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@aleph-sdk/message/-/message-1.3.0.tgz",
-      "integrity": "sha512-CYvMX3cd5Ld4PrnknT8Xy7apMM7E2ctyXTh/a96NzCvWUNq3eVxtsGqFsCBt54H1fxm9djDfJmr4K2JPt9PVKg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@aleph-sdk/message/-/message-1.3.1.tgz",
+      "integrity": "sha512-WJPOpVnR3mS0l/M0JE3xxcINgbmpyDlyIR0k1fyylondLaW7JprPSOmEbluzenefvScJ9RXFf3v8UPiPqI86cA==",
       "dependencies": {
         "axios": "^1.5.1",
         "form-data": "^4.0.0",
@@ -19765,9 +19765,9 @@
       }
     },
     "@aleph-sdk/message": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@aleph-sdk/message/-/message-1.3.0.tgz",
-      "integrity": "sha512-CYvMX3cd5Ld4PrnknT8Xy7apMM7E2ctyXTh/a96NzCvWUNq3eVxtsGqFsCBt54H1fxm9djDfJmr4K2JPt9PVKg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@aleph-sdk/message/-/message-1.3.1.tgz",
+      "integrity": "sha512-WJPOpVnR3mS0l/M0JE3xxcINgbmpyDlyIR0k1fyylondLaW7JprPSOmEbluzenefvScJ9RXFf3v8UPiPqI86cA==",
       "requires": {
         "axios": "^1.5.1",
         "form-data": "^4.0.0",
diff --git a/package.json b/package.json
index ec64e135..443a2499 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "@aleph-sdk/core": "^1.2.0",
     "@aleph-sdk/ethereum": "^1.2.0",
     "@aleph-sdk/evm": "^1.2.0",
-    "@aleph-sdk/message": "^1.3.0",
+    "@aleph-sdk/message": "^1.3.1",
     "@aleph-sdk/solana": "^1.2.1",
     "@aleph-sdk/superfluid": "^1.2.0",
     "@fortawesome/fontawesome-svg-core": "^6.3.0",
diff --git a/src/components/pages/computing/NewInstancePage/cmp.tsx b/src/components/pages/computing/NewInstancePage/cmp.tsx
index 1b1d5bf2..d6f9ae09 100644
--- a/src/components/pages/computing/NewInstancePage/cmp.tsx
+++ b/src/components/pages/computing/NewInstancePage/cmp.tsx
@@ -52,7 +52,7 @@ const CheckoutButton = React.memo(
     title = 'Create instance',
     tooltipContent,
     isFooter,
-    termsAndConditions,
+    shouldRequestTermsAndConditions,
     handleRequestTermsAndConditionsAgreement,
     handleSubmit,
   }: {
@@ -60,7 +60,7 @@ const CheckoutButton = React.memo(
     title?: string
     tooltipContent?: TooltipProps['content']
     isFooter: boolean
-    termsAndConditions?: string
+    shouldRequestTermsAndConditions?: boolean
     handleRequestTermsAndConditionsAgreement: UseNewInstancePageReturn['handleRequestTermsAndConditionsAgreement']
     handleSubmit: UseNewInstancePageReturn['handleSubmit']
   }) => {
@@ -70,14 +70,14 @@ const CheckoutButton = React.memo(
       <>
         <Button
           ref={checkoutButtonRef}
-          type={!!termsAndConditions ? 'button' : 'submit'}
+          type={shouldRequestTermsAndConditions ? 'button' : 'submit'}
           color="main0"
           kind="default"
           size="lg"
           variant="primary"
           disabled={disabled}
           onClick={
-            !!termsAndConditions
+            shouldRequestTermsAndConditions
               ? handleRequestTermsAndConditionsAgreement
               : handleSubmit
           }
@@ -121,6 +121,7 @@ export default function NewInstancePage({ mainRef }: PageProps) {
     selectedNode,
     setSelectedNode,
     termsAndConditions,
+    shouldRequestTermsAndConditions,
     modalOpen,
     modalClose,
     handleManuallySelectCRN,
@@ -131,13 +132,11 @@ export default function NewInstancePage({ mainRef }: PageProps) {
     handleRequestTermsAndConditionsAgreement,
     handleAcceptTermsAndConditions,
     handleCheckTermsAndConditions,
-    handleDownloadFile,
   } = useNewInstancePage()
 
   const sectionNumber = useCallback((n: number) => (node ? 1 : 0) + n, [node])
 
   // ------------------
-
   // Handle modals
   useEffect(
     () => {
@@ -193,14 +192,7 @@ export default function NewInstancePage({ mainRef }: PageProps) {
                     I have read, understood, and agree to the{' '}
                     <ExternalLink
                       text="Terms & Conditions"
-                      href="#"
-                      target="_self"
-                      onClick={() =>
-                        handleDownloadFile(
-                          termsAndConditions.cid,
-                          termsAndConditions.name,
-                        )
-                      }
+                      href={termsAndConditions.url}
                       color="main0"
                       typo="body3"
                       underline
@@ -249,6 +241,12 @@ export default function NewInstancePage({ mainRef }: PageProps) {
       handleCloseModal,
       handleCheckTermsAndConditions,
       handleAcceptTermsAndConditions,
+      /*
+      Both modalOpen and modalClose are not included in the dependencies because there's
+      an infinite refresh loop when they are included. This is because the modalOpen
+      and modalClose functions are being redefined on every render, causing the
+      useEffect to run again and again.
+       */
       // modalOpen,
       // modalClose,
     ],
@@ -574,7 +572,7 @@ export default function NewInstancePage({ mainRef }: PageProps) {
               title={createInstanceButtonTitle}
               tooltipContent={createInstanceDisabledMessage}
               isFooter={false}
-              termsAndConditions={node?.terms_and_conditions}
+              shouldRequestTermsAndConditions={shouldRequestTermsAndConditions}
               handleRequestTermsAndConditionsAgreement={
                 handleRequestTermsAndConditionsAgreement
               }
@@ -587,7 +585,7 @@ export default function NewInstancePage({ mainRef }: PageProps) {
               title={createInstanceButtonTitle}
               tooltipContent={createInstanceDisabledMessage}
               isFooter={true}
-              termsAndConditions={node?.terms_and_conditions}
+              shouldRequestTermsAndConditions={shouldRequestTermsAndConditions}
               handleRequestTermsAndConditionsAgreement={
                 handleRequestTermsAndConditionsAgreement
               }
diff --git a/src/components/pages/dashboard/ManageInstance/cmp.tsx b/src/components/pages/dashboard/ManageInstance/cmp.tsx
index e5eb2956..04b97f78 100644
--- a/src/components/pages/dashboard/ManageInstance/cmp.tsx
+++ b/src/components/pages/dashboard/ManageInstance/cmp.tsx
@@ -15,6 +15,7 @@ import LogsFeed from '../LogsFeed'
 export default function ManageInstance() {
   const {
     instance,
+    termsAndConditions,
     status,
     mappedKeys,
     nodeDetails,
@@ -332,6 +333,30 @@ export default function ManageInstance() {
                       <VolumeList {...{ volumes }} />
                     </>
                   )}
+
+                  {termsAndConditions !== undefined && (
+                    <>
+                      <Separator />
+                      <TextGradient type="h7" as="h2" color="main0">
+                        Terms & Conditions
+                      </TextGradient>
+                      <div tw="my-5">
+                        <div className="tp-info text-main0">ACCEPTED T&C</div>
+                        <div>
+                          <a
+                            className="tp-body1 fs-16"
+                            href={termsAndConditions.url}
+                            target="_blank"
+                            referrerPolicy="no-referrer"
+                          >
+                            <IconText iconName="square-up-right">
+                              <Text>{termsAndConditions.name}</Text>
+                            </IconText>
+                          </a>
+                        </div>
+                      </div>
+                    </>
+                  )}
                 </>
               ) : tabId === 'log' ? (
                 <>
diff --git a/src/domain/executable.ts b/src/domain/executable.ts
index 3f810d22..b97f4d83 100644
--- a/src/domain/executable.ts
+++ b/src/domain/executable.ts
@@ -700,10 +700,19 @@ export abstract class ExecutableManager {
 
   protected parseRequirements(node?: CRN): HostRequirements | undefined {
     if (!node || !node.hash) return
-    return {
+
+    const requirements = {
       node: {
         node_hash: node.hash,
       },
-    }
+    } as HostRequirements
+
+    if (node.terms_and_conditions)
+      requirements.node = {
+        ...requirements.node,
+        terms_and_conditions: node.terms_and_conditions,
+      }
+
+    return requirements
   }
 }
diff --git a/src/hooks/common/useFetchTermsAndConditions.ts b/src/hooks/common/useFetchTermsAndConditions.ts
new file mode 100644
index 00000000..03d907da
--- /dev/null
+++ b/src/hooks/common/useFetchTermsAndConditions.ts
@@ -0,0 +1,76 @@
+import { useAppState } from '@/contexts/appState'
+import { StoreContent } from '@aleph-sdk/message'
+import { useEffect, useState } from 'react'
+
+export type TermsAndConditions = {
+  cid: string
+  name: string
+  url: string
+}
+
+export type UseFetchTermsAndConditionsProps = {
+  termsAndConditionsMessageHash?: string
+}
+
+export type UseFetchTermsAndConditionsReturn = {
+  loading: boolean
+  termsAndConditions?: TermsAndConditions
+}
+
+export default function useFetchTermsAndConditions({
+  termsAndConditionsMessageHash,
+}: UseFetchTermsAndConditionsProps): UseFetchTermsAndConditionsReturn {
+  const [state] = useAppState()
+  const {
+    manager: { messageManager },
+  } = state
+
+  const [loading, setLoading] = useState(true)
+  const [termsAndConditions, setTermsAndConditions] = useState<
+    TermsAndConditions | undefined
+  >()
+
+  useEffect(() => {
+    const fetchTermsAndConditions = async () => {
+      try {
+        if (!messageManager) return setTermsAndConditions(undefined)
+        if (!termsAndConditionsMessageHash)
+          return setTermsAndConditions(undefined)
+
+        setLoading(true)
+
+        let storeMessageContent
+        try {
+          const { content } = await messageManager.get(
+            termsAndConditionsMessageHash,
+          )
+          storeMessageContent = content as StoreContent
+        } catch (e) {
+          console.error(e)
+        }
+
+        if (!storeMessageContent) return setTermsAndConditions(undefined)
+
+        const cid = storeMessageContent.item_hash
+        const name = storeMessageContent.metadata?.name as string
+
+        setTermsAndConditions({
+          cid,
+          name,
+          url: `https://ipfs.aleph.im/ipfs/${cid}?filename=${name}`,
+        })
+      } catch (e) {
+        console.error(e)
+      } finally {
+        setLoading(false)
+      }
+    }
+
+    fetchTermsAndConditions()
+  }, [messageManager, termsAndConditionsMessageHash])
+
+  return {
+    loading,
+    termsAndConditions,
+  }
+}
diff --git a/src/hooks/pages/computing/useNewInstancePage.ts b/src/hooks/pages/computing/useNewInstancePage.ts
index dc87494a..e81b6a46 100644
--- a/src/hooks/pages/computing/useNewInstancePage.ts
+++ b/src/hooks/pages/computing/useNewInstancePage.ts
@@ -62,7 +62,9 @@ import {
   unsupportedStreamManualCRNSelectionDisabledMessage,
   unsupportedStreamDisabledMessage,
 } from '@/components/pages/computing/NewInstancePage/disabledMessages'
-import { StoreContent } from '@aleph-sdk/message'
+import useFetchTermsAndConditions, {
+  TermsAndConditions,
+} from '@/hooks/common/useFetchTermsAndConditions'
 
 export type NewInstanceFormState = NameAndTagsField & {
   image: InstanceImageField
@@ -96,11 +98,6 @@ export const defaultValues: Partial<NewInstanceFormState> = {
 
 export type Modal = 'node-list' | 'terms-and-conditions'
 
-export type TermsAndConditions = {
-  cid: string
-  name: string
-}
-
 export type UseNewInstancePageReturn = {
   address: string
   accountBalance: number
@@ -123,6 +120,7 @@ export type UseNewInstancePageReturn = {
   selectedNode?: string
   setSelectedNode: (hash?: string) => void
   termsAndConditions?: TermsAndConditions
+  shouldRequestTermsAndConditions: boolean
   modalOpen?: (info: ModalCardProps) => void
   modalClose?: () => void
   handleManuallySelectCRN: () => void
@@ -130,17 +128,13 @@ export type UseNewInstancePageReturn = {
   handleRequestTermsAndConditionsAgreement: () => void
   handleCheckTermsAndConditions: () => void
   handleAcceptTermsAndConditions: (e: FormEvent) => void
-  handleDownloadFile: (fileHash: string, fileName: string) => Promise<void>
   handleSubmit: (e: FormEvent) => Promise<void>
   handleCloseModal: () => void
   handleBack: () => void
 }
 
 export function useNewInstancePage(): UseNewInstancePageReturn {
-  const [state, dispatch] = useAppState()
-  const {
-    manager: { fileManager, messageManager },
-  } = state
+  const [, dispatch] = useAppState()
 
   const {
     blockchain,
@@ -159,9 +153,6 @@ export function useNewInstancePage(): UseNewInstancePageReturn {
 
   const hasInitialized = useRef(false)
   const nodeRef = useRef<CRN | undefined>(undefined)
-  const [termsAndConditions, setTermsAndConditions] = useState<
-    TermsAndConditions | undefined
-  >()
   const [selectedNode, setSelectedNode] = useState<string>()
   const [selectedModal, setSelectedModal] = useState<Modal>()
 
@@ -189,6 +180,13 @@ export function useNewInstancePage(): UseNewInstancePageReturn {
     return specs[node.hash]?.data
   }, [specs, node])
 
+  // -------------------------
+  // Terms and conditions
+
+  const { termsAndConditions } = useFetchTermsAndConditions({
+    termsAndConditionsMessageHash: node?.terms_and_conditions,
+  })
+
   // -------------------------
   // Checkout flow
 
@@ -319,6 +317,13 @@ export function useNewInstancePage(): UseNewInstancePageReturn {
   // -------------------------
   // Memos
 
+  const shouldRequestTermsAndConditions = useMemo(() => {
+    return (
+      !!node?.terms_and_conditions &&
+      formValues.paymentMethod === PaymentMethod.Stream
+    )
+  }, [node, formValues.paymentMethod])
+
   const blockchainName = useMemo(() => {
     return blockchain ? blockchains[blockchain]?.name : 'Current network'
   }, [blockchain])
@@ -429,8 +434,9 @@ export function useNewInstancePage(): UseNewInstancePageReturn {
   }, [])
 
   const handleCheckTermsAndConditions = useCallback(() => {
-    if (formValues.termsAndConditions) setValue('termsAndConditions', undefined)
-    else setValue('termsAndConditions', node?.terms_and_conditions)
+    formValues.termsAndConditions
+      ? setValue('termsAndConditions', undefined)
+      : setValue('termsAndConditions', node?.terms_and_conditions)
   }, [formValues.termsAndConditions, node, setValue])
 
   const handleAcceptTermsAndConditions = useCallback(
@@ -441,21 +447,6 @@ export function useNewInstancePage(): UseNewInstancePageReturn {
     [handleCloseModal, handleSubmit],
   )
 
-  const handleDownloadFile = useCallback(
-    async (fileHash: string, fileName: string) => {
-      const downloadedFile = await fileManager.downloadFile(fileHash)
-      const customDownloadUrl = window.URL.createObjectURL(downloadedFile)
-      const a = document.createElement('a')
-      a.href = customDownloadUrl
-      a.download = fileName
-      document.body.appendChild(a)
-      a.click()
-      a.remove()
-      window.URL.revokeObjectURL(customDownloadUrl)
-    },
-    [fileManager],
-  )
-
   const handleBack = () => {
     router.push('.')
   }
@@ -509,30 +500,6 @@ export function useNewInstancePage(): UseNewInstancePageReturn {
     setValue('streamCost', cost.totalStreamCost)
   }, [cost, setValue, formValues])
 
-  useEffect(() => {
-    const fetchTermsAndConditions = async () => {
-      if (!messageManager) return setTermsAndConditions(undefined)
-      if (!node?.terms_and_conditions) return setTermsAndConditions(undefined)
-
-      let storeMessageContent
-      try {
-        const { content } = await messageManager.get(node.terms_and_conditions)
-        storeMessageContent = content as StoreContent
-      } catch (e) {
-        console.error(e)
-      }
-
-      if (!storeMessageContent) return setTermsAndConditions(undefined)
-
-      setTermsAndConditions({
-        cid: storeMessageContent.item_hash,
-        name: storeMessageContent.metadata?.name as string,
-      })
-    }
-
-    fetchTermsAndConditions()
-  }, [messageManager, node])
-
   return {
     address,
     accountBalance,
@@ -555,6 +522,7 @@ export function useNewInstancePage(): UseNewInstancePageReturn {
     selectedNode,
     setSelectedNode,
     termsAndConditions,
+    shouldRequestTermsAndConditions,
     modalOpen,
     modalClose,
     handleManuallySelectCRN,
@@ -562,7 +530,6 @@ export function useNewInstancePage(): UseNewInstancePageReturn {
     handleSubmit,
     handleCloseModal,
     handleBack,
-    handleDownloadFile,
     handleRequestTermsAndConditionsAgreement,
     handleCheckTermsAndConditions,
     handleAcceptTermsAndConditions,
diff --git a/src/hooks/pages/solutions/manage/useManageInstance.ts b/src/hooks/pages/solutions/manage/useManageInstance.ts
index aaf8bb79..7205da9c 100644
--- a/src/hooks/pages/solutions/manage/useManageInstance.ts
+++ b/src/hooks/pages/solutions/manage/useManageInstance.ts
@@ -11,9 +11,13 @@ import {
   UseExecutableActionsReturn,
   useExecutableActions,
 } from '@/hooks/common/useExecutableActions'
+import useFetchTermsAndConditions, {
+  TermsAndConditions,
+} from '@/hooks/common/useFetchTermsAndConditions'
 
 export type ManageInstance = UseExecutableActionsReturn & {
   instance?: Instance
+  termsAndConditions?: TermsAndConditions
   mappedKeys: (SSHKey | undefined)[]
   theme: DefaultTheme
   tabs: TabsProps['tabs']
@@ -47,6 +51,11 @@ export function useManageInstance(): ManageInstance {
 
   const { logsDisabled, status } = executableActions
 
+  const { termsAndConditions } = useFetchTermsAndConditions({
+    termsAndConditionsMessageHash:
+      instance?.requirements?.node?.terms_and_conditions,
+  })
+
   const tabs = useMemo(
     () =>
       [
@@ -91,6 +100,7 @@ export function useManageInstance(): ManageInstance {
   return {
     ...executableActions,
     instance,
+    termsAndConditions,
     mappedKeys,
     theme,
     tabs,