diff --git a/app/controllers/long_polling_controller.rb b/app/controllers/long_polling_controller.rb
index 492d8af48..f5b50c9f4 100644
--- a/app/controllers/long_polling_controller.rb
+++ b/app/controllers/long_polling_controller.rb
@@ -18,7 +18,7 @@ class LongPollingController < ApplicationController
       params['data'] = {}
     end
     session_data = {}
-    if current_user.id
+    if current_user && current_user.id
       session_data = { 'id' => current_user.id }
     end