diff --git a/js/client-chat-tournament.js b/js/client-chat-tournament.js
index 6889c2813..569a84a73 100644
--- a/js/client-chat-tournament.js
+++ b/js/client-chat-tournament.js
@@ -223,13 +223,17 @@
if (isBroadcast) {
switch (cmd) {
case 'info':
- var $infoList = $('
');
- JSON.parse(data.join('|')).forEach(function (tournament) {
- var $info = $('');
- $info.text(": " + Tools.getEffect(tournament.format).name + " " + tournament.generator + (tournament.isStarted ? " (Started)" : ""));
- $info.prepend($('').attr('href', app.root + toRoomid(tournament.room).toLowerCase()).text(tournament.room));
- $infoList.append($info);
- });
+ var tournaments = JSON.parse(data.join('|'));
+ var $infoList = "No tournaments are currently running.";
+ if (tournaments.length > 0) {
+ $infoList = $('');
+ tournaments.forEach(function (tournament) {
+ var $info = $('');
+ $info.text(": " + Tools.getEffect(tournament.format).name + " " + tournament.generator + (tournament.isStarted ? " (Started)" : ""));
+ $info.prepend($('').attr('href', app.root + toRoomid(tournament.room).toLowerCase()).text(tournament.room));
+ $infoList.append($info);
+ });
+ }
this.room.$chat.append($('').append($infoList)));
break;