diff --git a/apps/mobile/app/components/attachments/index.tsx b/apps/mobile/app/components/attachments/index.tsx
index 41456a699..4cf9a25d5 100644
--- a/apps/mobile/app/components/attachments/index.tsx
+++ b/apps/mobile/app/components/attachments/index.tsx
@@ -545,6 +545,7 @@ export const AttachmentDialog = ({
           }
           estimatedItemSize={50}
           data={loading ? [] : attachments?.placeholders || []}
+          extraData={attachments}
           renderItem={renderItem}
         />
       </View>
diff --git a/apps/mobile/app/components/note-history/index.tsx b/apps/mobile/app/components/note-history/index.tsx
index 7f768394b..a369975db 100644
--- a/apps/mobile/app/components/note-history/index.tsx
+++ b/apps/mobile/app/components/note-history/index.tsx
@@ -160,6 +160,7 @@ export default function NoteHistory({
           renderScrollComponent={(props) => <ScrollView {...props} />}
           data={history?.placeholders || []}
           estimatedItemSize={55}
+          extraData={history}
           ListEmptyComponent={
             <View
               style={{
diff --git a/apps/mobile/app/components/sheets/references/index.tsx b/apps/mobile/app/components/sheets/references/index.tsx
index 491ee0642..ace789d73 100644
--- a/apps/mobile/app/components/sheets/references/index.tsx
+++ b/apps/mobile/app/components/sheets/references/index.tsx
@@ -508,6 +508,7 @@ export const ReferencesList = ({ item, close }: ReferencesListProps) => {
             renderScrollComponent={(props) => <ScrollView {...props} />}
             bounces={false}
             data={items.placeholders || []}
+            extraData={items}
             renderItem={renderNote}
           />
         </View>
diff --git a/apps/mobile/app/components/side-menu/side-menu-tags.tsx b/apps/mobile/app/components/side-menu/side-menu-tags.tsx
index 65904e0e3..2216c4449 100644
--- a/apps/mobile/app/components/side-menu/side-menu-tags.tsx
+++ b/apps/mobile/app/components/side-menu/side-menu-tags.tsx
@@ -258,6 +258,7 @@ export const SideMenuTags = () => {
         <>
           <LegendList
             data={filteredTags?.placeholders || []}
+            extraData={filteredTags}
             bounces={false}
             estimatedItemSize={35}
             bouncesZoom={false}
diff --git a/apps/mobile/app/screens/manage-tags/index.tsx b/apps/mobile/app/screens/manage-tags/index.tsx
index 68c23cd88..6728aa5c3 100644
--- a/apps/mobile/app/screens/manage-tags/index.tsx
+++ b/apps/mobile/app/screens/manage-tags/index.tsx
@@ -257,14 +257,16 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
         width: "100%",
         alignSelf: "center",
         backgroundColor: colors.primary.background,
-        gap: DefaultAppStyles.GAP_VERTICAL
+        gap: DefaultAppStyles.GAP_VERTICAL,
+        flex: 1
       }}
     >
       <Header title={strings.manageTags()} canGoBack />
 
       <View
         style={{
-          paddingHorizontal: DefaultAppStyles.GAP
+          paddingHorizontal: DefaultAppStyles.GAP,
+          flex: 1
         }}
       >
         <Input
@@ -318,13 +320,12 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
 
         <View
           style={{
-            width: "100%",
-            flex: 1,
-            height: "100%"
+            flex: 1
           }}
         >
           <LegendList
             data={tags?.placeholders || []}
+            extraData={tags}
             keyboardShouldPersistTaps
             keyboardDismissMode="interactive"
             estimatedItemSize={50}
@@ -380,7 +381,7 @@ const TagItem = ({
     tag?.id ? state.selection[tag?.id] : false
   );
 
-  return !tag ? null : (
+  return (
     <Pressable
       key={tag?.id}
       style={{