diff --git a/Essentials/src/main/java/com/earth2me/essentials/ISettings.java b/Essentials/src/main/java/com/earth2me/essentials/ISettings.java
index fe1913af7..bbef5dc3f 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/ISettings.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/ISettings.java
@@ -46,6 +46,8 @@ public interface ISettings extends IConf {
 
     char getChatQuestion();
 
+    boolean isChatQuestionEnabled();
+
     BigDecimal getCommandCost(IEssentialsCommand cmd);
 
     BigDecimal getCommandCost(String label);
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Settings.java b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
index 18a42e8bb..188dd2bd5 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
@@ -226,6 +226,11 @@ public class Settings implements net.ess3.api.ISettings {
         return chatQuestion;
     }
 
+    @Override
+    public boolean isChatQuestionEnabled() {
+        return config.getBoolean("chat.question-enabled", true);
+    }
+
     public boolean _isTeleportSafetyEnabled() {
         return config.getBoolean("teleport-safety", true);
     }
diff --git a/Essentials/src/main/resources/config.yml b/Essentials/src/main/resources/config.yml
index 85a2cf628..69090a21e 100644
--- a/Essentials/src/main/resources/config.yml
+++ b/Essentials/src/main/resources/config.yml
@@ -921,6 +921,9 @@ chat:
   #  plots: "&dP&r"
   #  creative: "&eC&r"
 
+  # Whether chat questions should be enabled or not.
+  question-enabled: true
+
 ############################################################
 # +------------------------------------------------------+ #
 # |                 EssentialsX Protect                  | #
diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayer.java
index d5ff4320f..6a3251f2c 100644
--- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayer.java
+++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayer.java
@@ -38,7 +38,7 @@ public abstract class EssentialsChatPlayer implements Listener {
         final char prefix = message.charAt(0);
         if (prefix == ess.getSettings().getChatShout() || user.isToggleShout()) {
             return message.length() > 1 ? "shout" : "";
-        } else if (prefix == ess.getSettings().getChatQuestion()) {
+        } else if (ess.getSettings().isChatQuestionEnabled() && prefix == ess.getSettings().getChatQuestion()) {
             return message.length() > 1 ? "question" : "";
         } else {
             return "";