diff --git a/src/main/java/cc/fascinated/bat/service/GuildService.java b/src/main/java/cc/fascinated/bat/service/GuildService.java
index 1b322a6..2a41387 100644
--- a/src/main/java/cc/fascinated/bat/service/GuildService.java
+++ b/src/main/java/cc/fascinated/bat/service/GuildService.java
@@ -59,6 +59,9 @@ public class GuildService extends ListenerAdapter {
         if (guilds.containsKey(id)) {
             return guilds.get(id);
         }
+        if (DiscordService.JDA.getGuildById(id) == null) {
+            return null;
+        }
         long start = System.currentTimeMillis();
         Optional<BatGuild> optionalGuild = guildRepository.findById(id);