diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
index fdf2ddd..8f8cd71 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
@@ -207,7 +207,8 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 				e.printStackTrace();
 			}
 			try {
-				return channel.sendMessage(message);
+				return channel
+						.sendMessage(Test ? "*The following message is from a test server*\n" + message : message);
 			} catch (Exception e) {
 				if (i == 9) {
 					Bukkit.getLogger().warning("Failed to deliver message to Discord! Channel: " + channel.getName()
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index 7ad5636..a0669e6 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -20,6 +20,8 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 
 	@Override
 	public void handle(MessageReceivedEvent event) {
+		if (event.getMessage().getAuthor().isBot())
+			return;
 		if (event.getMessage().getChannel().getID().equals(DiscordPlugin.chatchannel.getID()))
 			TBMCChatAPI.SendChatMessage(Channel.GlobalChat, Bukkit.getConsoleSender(), event.getMessage().getContent());
 	}