diff --git a/CHANGELOG.md b/CHANGELOG.md
index 563daa792d..19823624e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2915](https://github.com/Pycord-Development/pycord/pull/2915))
 - `View.message` being `None` when it had not been interacted with yet.
   ([#2916](https://github.com/Pycord-Development/pycord/pull/2916))
+- Fixed a crash when processing message edit events while message cache was disabled.
+  ([#2924](https://github.com/Pycord-Development/pycord/pull/2924))
 
 ### Removed
 
diff --git a/discord/state.py b/discord/state.py
index 56bdcbd684..dc982d43bb 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -779,9 +779,10 @@ def parse_message_update(self, data) -> None:
         old_message = self._get_message(int(data["id"]))
         channel, _ = self._get_guild_channel(data)
         message = Message(channel=channel, data=data, state=self)
-        if old_message is not None:
-            self._messages.remove(old_message)
-        self._messages.append(message)
+        if self._messages is not None:
+            if old_message is not None:
+                self._messages.remove(old_message)
+            self._messages.append(message)
         raw = RawMessageUpdateEvent(data, message)
         self.dispatch("raw_message_edit", raw)
         if old_message is not None: