diff --git a/lib/commands/play.js b/lib/commands/play.js
index 731ac2f..9dd914d 100644
--- a/lib/commands/play.js
+++ b/lib/commands/play.js
@@ -47,7 +47,7 @@ module.exports = (config, Trivia, prefixStr) => {
     }
     else {
       // No category specified, start a normal game. (The database will pick a random category for us)
-      const game = Trivia.gameHandler.createGame(reply, Trivia.gameHandler, channelId, guildId, creatorId, {}, mode);
+      const game = Trivia.gameHandler.createGame(reply, Trivia.gameHandler, channelId, guildId, creatorId, {allowLongAnswers: Trivia.database.allowLongAnswers}, mode);
       onGameStarting(game);
       game.initializeRound();
 
diff --git a/lib/game/game.js b/lib/game/game.js
index 9449cf1..b495055 100644
--- a/lib/game/game.js
+++ b/lib/game/game.js
@@ -309,7 +309,7 @@ class Game extends EventEmitter {
 
     // String handling
     var answerString = this.buildAnswers();
-    if(this.gameMode === "standard") {
+    if(this.gameMode === "standard"  && !this.options.allowLongAnswers) {
       // No answer string in standard mode.
       // We still need buildAnswers to set the display IDs for the buttons.
       answerString = "";
diff --git a/lib/platform/discord_main.js b/lib/platform/discord_main.js
index c1e73c1..24497fe 100644
--- a/lib/platform/discord_main.js
+++ b/lib/platform/discord_main.js
@@ -63,10 +63,6 @@ class TriviaDiscord extends TriviaInstance {
           for(var i in restrictedChannelsInput) {
             var channelInput = restrictedChannelsInput[i];
     
-            if(this.restrictedChannels.length === restrictedChannelsInput.length) {
-              break;
-            }
-    
             if(channelInput === channel.id.toString()) {
               this.restrictedChannels.push(channel.id);
             }
@@ -1341,7 +1337,7 @@ class TriviaDiscord extends TriviaInstance {
     for(var i = 0; i <= answers.length-1; i++) {
       var style, text;
   
-      text = `${Letters[i]}: ${this.formatStr(answers[i])}`;
+      text = `${Letters[i]}${this.getConfig("database-allow-long-answers")?"":": "+this.formatStr(answers[i])}`;
       style = ButtonStyle.Secondary;
   
       if(text.length > 80) {