diff --git a/public/js/lib/poll_client.js b/public/js/lib/poll_client.js
index 43a0f0e..e300ca6 100644
--- a/public/js/lib/poll_client.js
+++ b/public/js/lib/poll_client.js
@@ -27,10 +27,11 @@ $(function() {
       timeout: TIMEOUT,
       error: function(xOptions, status) {
         if (status != 'timeout') {
-          return $status.text('JSONP error: '+status);
+          $status.text('JSONP error: '+status);
+        } else {
+          $status.text('Timeout, re-connect in '+PAUSE+' ms');
         }
 
-        $status.text('Timeout, re-connect in '+PAUSE+' ms');
         // Wait for PAUSE ms before re-connecting
         setTimeout(function() {
           poll();