diff --git a/src/hooks/useConsume/useConsume.ts b/src/hooks/useConsume/useConsume.ts
index 6fda211..599113c 100644
--- a/src/hooks/useConsume/useConsume.ts
+++ b/src/hooks/useConsume/useConsume.ts
@@ -1,8 +1,7 @@
 import { useState } from 'react'
 import { useOcean } from '../../providers'
 import { feedback } from '../../utils'
-import { DID, Logger } from '@oceanprotocol/lib'
-import { ServiceType } from '@oceanprotocol/lib/dist/node/ddo/interfaces/Service'
+import { DID, Logger, ServiceType } from '@oceanprotocol/lib'
 
 interface UseConsume {
   consume: (
diff --git a/src/hooks/useMetadata/useMetadata.ts b/src/hooks/useMetadata/useMetadata.ts
index fc660ec..ff88ec0 100644
--- a/src/hooks/useMetadata/useMetadata.ts
+++ b/src/hooks/useMetadata/useMetadata.ts
@@ -1,6 +1,12 @@
 import { useState, useEffect } from 'react'
-import axios from 'axios'
-import { DID, DDO, Metadata } from '@oceanprotocol/lib'
+import {
+  DID,
+  DDO,
+  Metadata,
+  MetadataStore,
+  Logger,
+  ConfigHelper
+} from '@oceanprotocol/lib'
 import { useOcean } from '../../providers'
 import ProviderStatus from '../../providers/OceanProvider/ProviderStatus'
 
@@ -20,9 +26,15 @@ function useMetadata(did?: DID | string): UseMetadata {
   const [title, setTitle] = useState<string | undefined>()
 
   async function getDDO(did: DID | string): Promise<DDO> {
-    if (status !== ProviderStatus.CONNECTED) return
+    if (status === ProviderStatus.CONNECTED) {
+      const ddo = await ocean.metadatastore.retrieveDDO(did)
+      return ddo
+    }
 
-    const ddo = await ocean.metadatastore.retrieveDDO(did)
+    // fallback hitting MetadataStore directly
+    const { metadataStoreUri } = new ConfigHelper()
+    const metadataStore = new MetadataStore(metadataStoreUri, Logger)
+    const ddo = await metadataStore.retrieveDDO(did)
     return ddo
   }