diff --git a/src/components/common/AutoComplete.tsx b/src/components/common/AutoComplete.tsx
index 2e840774..6f607b89 100644
--- a/src/components/common/AutoComplete.tsx
+++ b/src/components/common/AutoComplete.tsx
@@ -1,4 +1,3 @@
-import { SYSTEM_USER_ID } from "revolt.js";
 import { Channel } from "revolt.js/dist/maps/Channels";
 import { User } from "revolt.js/dist/maps/Users";
 import styled, { css } from "styled-components";
@@ -159,7 +158,9 @@ export function useAutoComplete(
                     }
                 }
 
-                users = users.filter((x) => x._id !== SYSTEM_USER_ID);
+                users = users.filter(
+                    (x) => x._id !== "00000000000000000000000000",
+                );
 
                 const matches = (
                     search.length > 0
diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx
index 266770cd..af8b512d 100644
--- a/src/components/common/messaging/attachments/MessageReply.tsx
+++ b/src/components/common/messaging/attachments/MessageReply.tsx
@@ -3,7 +3,6 @@ import { File } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { useHistory } from "react-router-dom";
 import { RelationshipStatus } from "revolt-api/types/Users";
-import { SYSTEM_USER_ID } from "revolt.js";
 import { Channel } from "revolt.js/dist/maps/Channels";
 import { Message } from "revolt.js/dist/maps/Messages";
 import styled, { css } from "styled-components";
@@ -173,7 +172,7 @@ export const MessageReply = observer(
                     <Text id="app.main.channel.misc.blocked_user" />
                 ) : (
                     <>
-                        {message.author_id === SYSTEM_USER_ID ? (
+                        {message.author_id === "00000000000000000000000000" ? (
                             <SystemMessage message={message} hideInfo />
                         ) : (
                             <>
diff --git a/src/components/common/messaging/bars/ReplyBar.tsx b/src/components/common/messaging/bars/ReplyBar.tsx
index 1b83430d..2f0fc52e 100644
--- a/src/components/common/messaging/bars/ReplyBar.tsx
+++ b/src/components/common/messaging/bars/ReplyBar.tsx
@@ -1,7 +1,6 @@
 import { At, Reply as ReplyIcon } from "@styled-icons/boxicons-regular";
 import { File, XCircle } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
-import { SYSTEM_USER_ID } from "revolt.js";
 import { Channel } from "revolt.js/dist/maps/Channels";
 import { Message } from "revolt.js/dist/maps/Messages";
 import styled from "styled-components";
@@ -150,7 +149,8 @@ export default observer(({ channel, replies, setReplies }: Props) => {
                                         </em>
                                     </>
                                 )}
-                                {message.author_id === SYSTEM_USER_ID ? (
+                                {message.author_id ===
+                                "00000000000000000000000000" ? (
                                     <SystemMessage message={message} hideInfo />
                                 ) : (
                                     <Markdown
diff --git a/src/context/revoltjs/Notifications.tsx b/src/context/revoltjs/Notifications.tsx
index cd79dafe..153b1160 100644
--- a/src/context/revoltjs/Notifications.tsx
+++ b/src/context/revoltjs/Notifications.tsx
@@ -1,6 +1,5 @@
 import { Route, Switch, useHistory, useParams } from "react-router-dom";
 import { Presence, RelationshipStatus } from "revolt-api/types/Users";
-import { SYSTEM_USER_ID } from "revolt.js";
 import { Message } from "revolt.js/dist/maps/Messages";
 import { User } from "revolt.js/dist/maps/Users";
 import { decodeTime } from "ulid";
@@ -72,7 +71,7 @@ function Notifier({ options, notifs }: Props) {
                     title = `@${msg.author?.username}`;
                     break;
                 case "Group":
-                    if (msg.author?._id === SYSTEM_USER_ID) {
+                    if (msg.author?._id === "00000000000000000000000000") {
                         title = msg.channel.name;
                     } else {
                         title = `@${msg.author?.username} - ${msg.channel.name}`;
diff --git a/src/pages/channels/messaging/MessageRenderer.tsx b/src/pages/channels/messaging/MessageRenderer.tsx
index d1a442fa..190a5199 100644
--- a/src/pages/channels/messaging/MessageRenderer.tsx
+++ b/src/pages/channels/messaging/MessageRenderer.tsx
@@ -2,7 +2,6 @@
 import { X } from "@styled-icons/boxicons-regular";
 import { observer } from "mobx-react-lite";
 import { RelationshipStatus } from "revolt-api/types/Users";
-import { SYSTEM_USER_ID } from "revolt.js";
 import { Message as MessageI } from "revolt.js/dist/maps/Messages";
 import styled from "styled-components";
 import { decodeTime } from "ulid";
@@ -141,7 +140,7 @@ const MessageRenderer = observer(({ renderer, queue, highlight }: Props) => {
             );
         }
 
-        if (message.author_id === SYSTEM_USER_ID) {
+        if (message.author_id === "00000000000000000000000000") {
             render.push(
                 <SystemMessage
                     key={message._id}