diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f466356d7e25028c9f3a1b2d2159c8e0410eb0e2..22556c0e585e85e5bfecafaaa98b2418ce8ee073 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: docker:19.03.1
 variables:
   DOCKER_TLS_CERTDIR: "/certs"
   IMAGE_TAG: $CI_REGISTRY_IMAGE
-  IMAGE_VER: 1.6.0
+  IMAGE_VER: 1.6.1
 
 services:
   - docker:19.03.1-dind
diff --git a/lib/CF/Controller/Websockets.pm b/lib/CF/Controller/Websockets.pm
index cd22a9120f0c89cf6af45a3a1c20b6bde6b2a55c..9600e85b0015ca2ce3bef3806dbf5563ead723e9 100644
--- a/lib/CF/Controller/Websockets.pm
+++ b/lib/CF/Controller/Websockets.pm
@@ -55,8 +55,8 @@ sub main {
                 my $tx = $c->pg->db->begin;
 
                 $c->pg->db->delete('sockets', [
-                    {id      => $key},
-                    {user_id => $message->{payload} || undef },
+                    {id => $key},
+                    $user ? {user_id => $user->{id}}:{}
                 ]);
 
                 $c->pg->db->insert('sockets', {