Merge branch 'master' of github.com:matrix-org/synapse into develop

1 files changed, 1 insertions, 1 deletions

diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js

index 321054f904..c7be65720a 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -189,7 +189,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
                 
                 // always bing if there are 0 bing words... apparently.
                 var bingWords = matrixService.config().bingWords;
-                if (bingWords && bingWords.length === 0) {
+                if (bingWords === undefined || bingWords.length === 0) {
                     shouldBing = true;
                 }