diff --git a/src/equicordplugins/hideMessage/index.tsx b/src/equicordplugins/hideMessage/index.tsx
index 452b4607..f0961cef 100644
--- a/src/equicordplugins/hideMessage/index.tsx
+++ b/src/equicordplugins/hideMessage/index.tsx
@@ -32,7 +32,7 @@ const patchMessageContextMenu: NavContextMenuPatchCallback = (children, { messag
     const { deleted, id, channel_id } = message;
     if (deleted || message.state !== "SENT") return;
 
-    const isHidden = hiddenMessages.has(id);
+    const isHidden = hiddenMessages?.has(id) ?? false;
     if (isHidden) {
         return children.push(
             <Menu.MenuItem
@@ -98,7 +98,8 @@ const buildCss = () => {
 };
 
 export const revealMessage = (id: string) => {
-    if (hiddenMessages.has(id)) {
+    const isHidden = hiddenMessages?.has(id) ?? false;
+    if (isHidden) {
         hiddenMessages.delete(id);
         buildCss();
 
@@ -148,7 +149,8 @@ export default definePlugin({
         }
 
         addMessageAccessory("vc-hide-message", ({ message }) => {
-            if (hiddenMessages.has(message.id) && settings.store.showNotice) return <HideMessageAccessory id={message.id} />;
+            const isHidden = hiddenMessages?.has(message.id) ?? false;
+            if (isHidden && settings.store.showNotice) return <HideMessageAccessory id={message.id} />;
             return null;
         });
     },
diff --git a/src/plugins/hideAttachments/index.tsx b/src/plugins/hideAttachments/index.tsx
index fe9e6899..58c5af6a 100644
--- a/src/plugins/hideAttachments/index.tsx
+++ b/src/plugins/hideAttachments/index.tsx
@@ -63,7 +63,7 @@ export default definePlugin({
 
         if (!msg.attachments.length && !msg.embeds.length && !msg.stickerItems.length && !hasAttachmentsInShapshots) return null;
 
-        const isHidden = hiddenMessages.has(msg.id);
+        const isHidden = hiddenMessages?.has(msg.id) ?? false;
 
         return {
             label: isHidden ? "Show Media" : "Hide Media",
@@ -93,7 +93,7 @@ export default definePlugin({
     },
 
     shouldHide(messageId: string) {
-        return hiddenMessages.has(messageId);
+        return hiddenMessages?.has(messageId) ?? false;
     },
 
     async toggleHide(channelId: string, messageId: string) {