diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerChannelMessage.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerChannelMessage.java
index fb90082c6..f4c067429 100644
--- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerChannelMessage.java
+++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerChannelMessage.java
@@ -20,6 +20,9 @@ public class ServerChannelMessage {
     }
 
     public static ServerChannelMessage fromMessage(Message message) {
+        if(message == null) {
+            return null;
+        }
         return ServerChannelMessage
                 .builder()
                 .serverId(message.getGuild().getIdLong())
@@ -29,6 +32,9 @@ public class ServerChannelMessage {
     }
 
     public static ServerChannelMessage fromCachedMessage(CachedMessage cachedMessage) {
+        if(cachedMessage == null) {
+            return null;
+        }
         return ServerChannelMessage
                 .builder()
                 .serverId(cachedMessage.getServerId())