diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
index 785dda352427c97285a96fb08b963e5937bd3468..63e13b8341b3e383c66f183c2012e90615e4ff25 100644
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -9,12 +9,9 @@ module ApplicationCable
     end
 
     def find_user
-      current_user = User.find_by(labs_user_id: "2")
-      if current_user
-        # puts "Current user case, id #{current_user.id}"
+      if current_user = User.find_by(id: cookies.encrypted['_web_session']['current_user_id'])
         current_user
       else
-        puts "Unauthorized connection rejected"
         reject_unauthorized_connection
       end
     end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 38f5f6928d320bd9e70c5d0a0a3b60ca337b0ad6..b11214f1dd0afd67b296936e306dcdb2ec5a44a2 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,2 +1,2 @@
-Rails.application.config.session_store :active_record_store, :key => "_web_session"
+Rails.application.config.session_store :cookie_store, :key => "_web_session"
 # Run this regularly to clean up DB: 'rails db:sessions:trim'