diff --git a/src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java b/src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java
index be80fbf..76ec6d1 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java
@@ -20,6 +20,7 @@ public abstract class DiscordCommandBase {
 		commands.put("userinfo", new UserinfoCommand());
 		commands.put("help", new HelpCommand());
 		commands.put("role", new RoleCommand());
+		commands.put("mcchat", new MCChatCommand());
 	}
 
 	public static void runCommand(String cmd, String args, IMessage message) {
diff --git a/src/main/java/buttondevteam/discordplugin/commands/MCChatCommand.java b/src/main/java/buttondevteam/discordplugin/commands/MCChatCommand.java
index 39f632d..f2c9b52 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/MCChatCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/MCChatCommand.java
@@ -19,7 +19,7 @@ public class MCChatCommand extends DiscordCommandBase {
 		}
 		PlayerData<Boolean> mcchat = DiscordPlayer.getUser(message.getAuthor().getStringID(), DiscordPlayer.class)
 				.minecraftChat();
-		mcchat.set(!mcchat.get());
+		mcchat.set(!mcchat.getOrDefault(false));
 		message.reply("Minecraft chat " + (mcchat.get() ? "enabled." : "disabled."));
 	}
 
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index 2ed2e17..5b07f2e 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -64,7 +64,7 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 				final IUser iUser = data.channel.getUsersHere().stream()
 						.filter(u -> u.getLongID() != u.getClient().getOurUser().getLongID()).findFirst().get(); // Doesn't support group DMs
 				final DiscordPlayer user = DiscordPlayer.getUser(iUser.getStringID(), DiscordPlayer.class);
-				if (user.minecraftChat().get() && e.shouldSendTo(getSender(data.channel, iUser, user)))
+				if (user.minecraftChat().getOrDefault(false) && e.shouldSendTo(getSender(data.channel, iUser, user)))
 					doit.accept(data);
 			}
 		} // TODO: Author URL
@@ -125,8 +125,8 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 	public void handle(MessageReceivedEvent event) {
 		final IUser author = event.getMessage().getAuthor();
 		if (!event.getMessage().getChannel().getStringID().equals(DiscordPlugin.chatchannel.getStringID())
-				&& !(event.getMessage().getChannel().isPrivate()
-						&& DiscordPlayer.getUser(author.getStringID(), DiscordPlayer.class).minecraftChat().get()))
+				&& !(event.getMessage().getChannel().isPrivate() && DiscordPlayer
+						.getUser(author.getStringID(), DiscordPlayer.class).minecraftChat().getOrDefault(false)))
 			return;
 		resetLastMessage();
 		lastlist++;