diff --git a/webapp/src/components/cardDialog.tsx b/webapp/src/components/cardDialog.tsx
index 91f524062..dba5cae54 100644
--- a/webapp/src/components/cardDialog.tsx
+++ b/webapp/src/components/cardDialog.tsx
@@ -28,7 +28,7 @@ const CardDialog = (props: Props) => {
     const [syncComplete, setSyncComplete] = useState(false)
     const [cardTree, setCardTree] = useState<CardTree>()
     useCardListener(
-        props.cardId,
+        [props.cardId],
         async (blocks) => {
             Utils.log(`cardListener.onChanged: ${blocks.length}`)
             const newCardTree = cardTree ? MutableCardTree.incrementalUpdate(cardTree, blocks) : await MutableCardTree.sync(props.cardId)
diff --git a/webapp/src/components/gallery/gallery.tsx b/webapp/src/components/gallery/gallery.tsx
index 19598e298..cc107c187 100644
--- a/webapp/src/components/gallery/gallery.tsx
+++ b/webapp/src/components/gallery/gallery.tsx
@@ -1,9 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
-import React from 'react'
+import React, {useState, useEffect} from 'react'
 import {FormattedMessage} from 'react-intl'
 
 import {BoardTree} from '../../viewModel/boardTree'
+import {CardTree, MutableCardTree} from '../../viewModel/cardTree'
+import useCardListener from '../../hooks/cardListener'
 
 import './gallery.scss'
 import GalleryCard from './galleryCard'
@@ -18,18 +20,45 @@ type Props = {
 const Gallery = (props: Props): JSX.Element => {
     const {boardTree} = props
     const {cards} = boardTree
+    const [cardTrees, setCardTrees] = useState<{[key: string]: CardTree | undefined}>({})
+
+    useCardListener(
+        cards.map((c) => c.id),
+        async (blocks) => {
+            cards.forEach(async (c) => {
+                const cardTree = cardTrees[c.id]
+                const newCardTree = cardTree ? MutableCardTree.incrementalUpdate(cardTree, blocks) : await MutableCardTree.sync(c.id)
+                setCardTrees((oldTree) => ({...oldTree, [c.id]: newCardTree}))
+            })
+        },
+        async () => {
+            cards.forEach(async (c) => {
+                const newCardTree = await MutableCardTree.sync(c.id)
+                setCardTrees((oldTree) => ({...oldTree, [c.id]: newCardTree}))
+            })
+        },
+    )
+
+    useEffect(() => {
+        cards.forEach(async (c) => {
+            const newCardTree = await MutableCardTree.sync(c.id)
+            setCardTrees((oldTree) => ({...oldTree, [c.id]: newCardTree}))
+        })
+    }, [cards])
 
     return (
         <div className='octo-table-body Gallery'>
             {cards.map((card) => {
-                const tableRow = (
-                    <GalleryCard
-                        key={card.id + card.updateAt}
-                        card={card}
-                        showCard={props.showCard}
-                    />)
-
-                return tableRow
+                if (cardTrees[card.id]) {
+                    return (
+                        <GalleryCard
+                            key={card.id + card.updateAt}
+                            cardTree={cardTrees[card.id]}
+                            showCard={props.showCard}
+                        />
+                    )
+                }
+                return null
             })}
 
             {/* Add New row */}
diff --git a/webapp/src/components/gallery/galleryCard.tsx b/webapp/src/components/gallery/galleryCard.tsx
index 0922649f5..99991455c 100644
--- a/webapp/src/components/gallery/galleryCard.tsx
+++ b/webapp/src/components/gallery/galleryCard.tsx
@@ -1,53 +1,31 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
-import React, {useState, useEffect} from 'react'
+import React from 'react'
 import {FormattedMessage} from 'react-intl'
 
-import {Card} from '../../blocks/card'
-import {CardTree, MutableCardTree} from '../../viewModel/cardTree'
+import {CardTree} from '../../viewModel/cardTree'
 import {IContentBlock} from '../../blocks/contentBlock'
 
-import useCardListener from '../../hooks/cardListener'
-
 import ImageElement from '../content/imageElement'
 import ContentElement from '../content/contentElement'
 
 import './galleryCard.scss'
 
 type Props = {
-    card: Card
+    cardTree: CardTree
     showCard: (cardId: string) => void
 }
 
 const GalleryCard = React.memo((props: Props) => {
-    const {card} = props
-    const [cardTree, setCardTree] = useState<CardTree>()
-    useCardListener(
-        card.id,
-        async (blocks) => {
-            const newCardTree = cardTree ? MutableCardTree.incrementalUpdate(cardTree, blocks) : await MutableCardTree.sync(card.id)
-            setCardTree(newCardTree)
-        },
-        async () => {
-            const newCardTree = await MutableCardTree.sync(card.id)
-            setCardTree(newCardTree)
-        },
-    )
-
-    useEffect(() => {
-        const f = async () => setCardTree(await MutableCardTree.sync(card.id))
-        f()
-    }, [])
+    const {cardTree} = props
 
     let images: IContentBlock[] = []
-    if (cardTree) {
-        images = cardTree.contents.filter((content) => content.type === 'image')
-    }
+    images = cardTree.contents.filter((content) => content.type === 'image')
 
     return (
         <div
             className='GalleryCard'
-            onClick={() => props.showCard(props.card.id)}
+            onClick={() => props.showCard(cardTree.card.id)}
         >
             {images?.length > 0 &&
                 <div className='gallery-image'>
@@ -64,9 +42,9 @@ const GalleryCard = React.memo((props: Props) => {
                     ))}
                 </div>}
             <div className='gallery-title'>
-                { card.icon ? <div className='octo-icon'>{card.icon}</div> : undefined }
+                { cardTree.card.icon ? <div className='octo-icon'>{cardTree.card.icon}</div> : undefined }
                 <div key='__title'>
-                    {card.title ||
+                    {cardTree.card.title ||
                         <FormattedMessage
                             id='KanbanCard.untitled'
                             defaultMessage='Untitled'
diff --git a/webapp/src/hooks/cardListener.tsx b/webapp/src/hooks/cardListener.tsx
index 3b298ce00..4e156c10f 100644
--- a/webapp/src/hooks/cardListener.tsx
+++ b/webapp/src/hooks/cardListener.tsx
@@ -7,7 +7,7 @@ import octoClient from '../octoClient'
 import {OctoListener} from '../octoListener'
 import {Utils} from '../utils'
 
-export default function useCardListener(cardId:string, onChange: (blocks: IBlock[]) => void, onReconnect: () => void): void {
+export default function useCardListener(cardIds: string[], onChange: (blocks: IBlock[]) => void, onReconnect: () => void): void {
     let cardListener: OctoListener | null = null
 
     const deleteListener = () => {
@@ -21,7 +21,7 @@ export default function useCardListener(cardId:string, onChange: (blocks: IBlock
         cardListener = new OctoListener()
         cardListener.open(
             octoClient.workspaceId,
-            [cardId],
+            cardIds,
             onChange,
             onReconnect,
         )
@@ -33,11 +33,11 @@ export default function useCardListener(cardId:string, onChange: (blocks: IBlock
     }
 
     useEffect(() => {
-        Utils.log(`useCardListener.connect: ${cardId}`)
+        Utils.log(`useCardListener.connect: ${cardIds}`)
         createCardTreeAndSync()
         return () => {
-            Utils.log(`useCardListener.disconnect: ${cardId}`)
+            Utils.log(`useCardListener.disconnect: ${cardIds}`)
             deleteListener()
         }
-    }, [cardId])
+    }, [cardIds.join('-')])
 }