diff --git a/structures/LinesPoliceCadBot.js b/structures/LinesPoliceCadBot.js
index a88fb94..6c2d0ba 100644
--- a/structures/LinesPoliceCadBot.js
+++ b/structures/LinesPoliceCadBot.js
@@ -188,13 +188,10 @@ class LinesPoliceCadBot extends Client {
     let guild = await this.dbo.collection("prefixes").findOne({"server.serverID":GuildId}).then(guild => guild);
 
     // If guild not found, generate guild default
-    if (!guild || !guild.server) {
+    if (!guild) {
       let guild = {
         server: {
           serverID: GuildId,
-          prefix: this.config.DefaultPrefix,
-          hasCustomRoles: false,
-          hasCustomChannels: false,
           allowedChannels: [],
         }
       }
@@ -204,8 +201,7 @@ class LinesPoliceCadBot extends Client {
     }
     let guildData = {
       allowedChannels: guild.server.allowedChannels,
-      customRoleStatus: guild.server.hasCustomRoles,
-      customChannelStatus: guild.server.hasCustomChannels,
+      customChannelStatus: guild.server.allowedChannels.length > 0 ? true : false,
       serverID: GuildId
     }
     return guildData;