diff --git a/packages/atlas/src/components/HotCreatorTokens/HotCreatorTokens.tsx b/packages/atlas/src/components/HotCreatorTokens/HotCreatorTokens.tsx
index 55f69ea959..e150aa8ca9 100644
--- a/packages/atlas/src/components/HotCreatorTokens/HotCreatorTokens.tsx
+++ b/packages/atlas/src/components/HotCreatorTokens/HotCreatorTokens.tsx
@@ -65,7 +65,7 @@ export const HotCreatorTokens = ({ interval, tableTitle }: { interval: number; t
       periodDays: interval,
       limit: 10,
       where: {
-        id_in: topInteractedTokens?.getTopInteractedEnities.map((entity) => entity.entityId),
+        id_in: topInteractedTokens?.getTopInteractedEntities.map((entity) => entity.entityId),
       },
     },
   })
diff --git a/packages/atlas/src/components/NftCarousel/components/MarketplaceCarouselCard/types/CrtCarouselDetails.tsx b/packages/atlas/src/components/NftCarousel/components/MarketplaceCarouselCard/types/CrtCarouselDetails.tsx
index 31fcf641cb..b18c97c4f1 100644
--- a/packages/atlas/src/components/NftCarousel/components/MarketplaceCarouselCard/types/CrtCarouselDetails.tsx
+++ b/packages/atlas/src/components/NftCarousel/components/MarketplaceCarouselCard/types/CrtCarouselDetails.tsx
@@ -39,7 +39,7 @@ export const CrtCarouselDetails = ({
     currentSale,
     channel,
   } = crt
-  const { video } = trailerVideo[0] ?? {}
+  const { video } = trailerVideo ?? {}
   const thumbnailUrls: string[] = video?.thumbnailPhoto?.resolvedUrls ?? []
   const mediaUrls: string[] = video?.media?.resolvedUrls ?? []
   const isLoading = !thumbnailUrls || !mediaUrls
@@ -127,7 +127,7 @@ export const CrtCarouselDetails = ({
 
   return (
     <VideoCardWrapper
-      videoId={video?.id}
+      videoId={video?.id ?? ''}
       active={active}
       goNextSlide={slideNext}
       mediaUrls={mediaUrls}
diff --git a/packages/atlas/src/views/studio/CrtDashboard/tabs/CrtDashboardMainTab.tsx b/packages/atlas/src/views/studio/CrtDashboard/tabs/CrtDashboardMainTab.tsx
index 855b6e25fd..dd23df35f4 100644
--- a/packages/atlas/src/views/studio/CrtDashboard/tabs/CrtDashboardMainTab.tsx
+++ b/packages/atlas/src/views/studio/CrtDashboard/tabs/CrtDashboardMainTab.tsx
@@ -184,14 +184,14 @@ const DashboardTokenProgress = ({ token }: Pick<CrtDashboardMainTabProps, 'token
     : ''
 
   const currentMemberStep = useMemo((): number => {
-    if (!(token.description || token.benefits.length || token.trailerVideo.length)) return 1
+    if (!(token.description || token.benefits.length || token.trailerVideo)) return 1
     if (!token.ammCurves.length && !token.sales.length) return 2
     if (!token.revenueShares.length) return 3
     return 4
   }, [
     token.description,
     token.benefits.length,
-    token.trailerVideo.length,
+    token.trailerVideo,
     token.ammCurves.length,
     token.sales.length,
     token.revenueShares.length,
@@ -234,7 +234,7 @@ const DashboardTokenProgress = ({ token }: Pick<CrtDashboardMainTabProps, 'token
         let isFinished = idx === 0
 
         if (idx === 1) {
-          isFinished = !!(token.description || token.benefits.length || token.trailerVideo.length)
+          isFinished = !!(token.description || token.benefits.length || token.trailerVideo)
         }
 
         if (idx === 2) {
@@ -256,7 +256,7 @@ const DashboardTokenProgress = ({ token }: Pick<CrtDashboardMainTabProps, 'token
       token.description,
       token.revenueShares.length,
       token.sales.length,
-      token.trailerVideo.length,
+      token.trailerVideo,
     ]
   )
   const numberOfFinishedSteps = steps.filter((step) => step.finished).length
diff --git a/packages/atlas/src/views/studio/CrtTokenEditView/CrtTokenEditView.tsx b/packages/atlas/src/views/studio/CrtTokenEditView/CrtTokenEditView.tsx
index 049caa4ea9..bbf0be08b8 100644
--- a/packages/atlas/src/views/studio/CrtTokenEditView/CrtTokenEditView.tsx
+++ b/packages/atlas/src/views/studio/CrtTokenEditView/CrtTokenEditView.tsx
@@ -73,7 +73,7 @@ export const CrtTokenEditView = () => {
   useEffect(() => {
     if (tokenData?.creatorTokenById) {
       form.reset({
-        videoId: tokenData?.creatorTokenById?.trailerVideo[0]?.video.id,
+        videoId: tokenData?.creatorTokenById?.trailerVideo?.video.id,
         benefits: tokenData?.creatorTokenById?.benefits,
         about: tokenData?.creatorTokenById?.description ?? '',
       })
diff --git a/packages/atlas/src/views/viewer/ChannelView/ChannelViewTabs/ChannelToken.tsx b/packages/atlas/src/views/viewer/ChannelView/ChannelViewTabs/ChannelToken.tsx
index 357866cc98..fcf20bfc79 100644
--- a/packages/atlas/src/views/viewer/ChannelView/ChannelViewTabs/ChannelToken.tsx
+++ b/packages/atlas/src/views/viewer/ChannelView/ChannelViewTabs/ChannelToken.tsx
@@ -85,7 +85,7 @@ export const ChannelToken = ({ tokenId, memberId, cumulativeRevenue }: ChannelTo
           <TokenDetails
             about={token?.description ?? ''}
             benefits={token?.benefits}
-            videoId={token?.trailerVideo?.[0]?.video.id}
+            videoId={token?.trailerVideo?.video.id}
           />
         )}
       </GridItem>