diff --git a/Plugins/CustomQuoter/CustomQuoter.plugin.js b/Plugins/CustomQuoter/CustomQuoter.plugin.js
index fb39bba883..5e45da487f 100644
--- a/Plugins/CustomQuoter/CustomQuoter.plugin.js
+++ b/Plugins/CustomQuoter/CustomQuoter.plugin.js
@@ -5,6 +5,7 @@ var CustomQuoter = (_ => {
 		render() {
 			let spoofChannel = new BDFDB.DiscordObjects.Channel({
 				id: "126223823845647771",
+				guild_id: "850725684241078788",
 				name: "Test Channel"
 			});
 			let spoofQuotedMessage = new BDFDB.DiscordObjects.Message({
@@ -221,7 +222,7 @@ var CustomQuoter = (_ => {
 			let unquotedLines = message.content.split("\n").filter(line => !line.startsWith("> "));
 			unquotedLines = unquotedLines.slice(unquotedLines.findIndex(line => line.trim().length > 0)).join("\n");
 			
-			let guild = channel.guild_id ? (BDFDB.LibraryModules.GuildStore.getGuild(channel.guild_id) || {id: "850725684241078788", name: "Test Server"}) : {id: "@me", name: BDFDB.LanguageUtils.LanguageStrings.DIRECT_MESSAGES};
+			let guild = channel.guild_id ? (BDFDB.LibraryModules.GuildStore.getGuild(channel.guild_id) || {id: channel.guild_id, name: "Test Server"}) : {id: "@me", name: BDFDB.LanguageUtils.LanguageStrings.DIRECT_MESSAGES};
 			
 			
 			return BDFDB.StringUtils.insertNRST(customQuote)