diff --git a/app/controllers/user_devices_controller.rb b/app/controllers/user_devices_controller.rb
index d2105f984..e189e1530 100644
--- a/app/controllers/user_devices_controller.rb
+++ b/app/controllers/user_devices_controller.rb
@@ -14,8 +14,9 @@ class UserDevicesController < ApplicationController
       attributes.delete('created_at')
       attributes.delete('device_details')
       attributes.delete('location_details')
+      attributes.delete('fingerprint')
 
-      if session[:user_device_id] == device.id
+      if session[:user_device_fingerprint] == device.fingerprint
         attributes['current'] = true
       end
       devices_full.push attributes