diff --git a/server/cursor-channel.cpp b/server/cursor-channel.cpp
index c5d60882..4171da2b 100644
--- a/server/cursor-channel.cpp
+++ b/server/cursor-channel.cpp
@@ -293,11 +293,9 @@ void CursorChannel::do_init()
     cursor_channel_init_client(this, NULL);
 }
 
-void cursor_channel_set_mouse_mode(CursorChannel *cursor, uint32_t mode)
+void CursorChannel::set_mouse_mode(uint32_t mode)
 {
-    spice_return_if_fail(cursor);
-
-    cursor->mouse_mode = mode;
+    mouse_mode = mode;
 }
 
 /**
diff --git a/server/cursor-channel.h b/server/cursor-channel.h
index 0a60e03e..126834da 100644
--- a/server/cursor-channel.h
+++ b/server/cursor-channel.h
@@ -38,6 +38,7 @@ struct CursorChannel final: public CommonGraphicsChannel
     ~CursorChannel();
     void do_init();
     void process_cmd(RedCursorCmd *cursor_cmd);
+    void set_mouse_mode(uint32_t mode);
     void on_connect(RedClient *client, RedStream *stream, int migration,
                     RedChannelCapabilities *caps) override;
 
@@ -61,7 +62,6 @@ red::shared_ptr<CursorChannel> cursor_channel_new(RedsState *server, int id,
                                                   Dispatcher *dispatcher);
 
 void                 cursor_channel_reset       (CursorChannel *cursor);
-void                 cursor_channel_set_mouse_mode(CursorChannel *cursor, uint32_t mode);
 
 #include "pop-visibility.h"
 
diff --git a/server/red-worker.cpp b/server/red-worker.cpp
index 9824d1d1..e54e7a9e 100644
--- a/server/red-worker.cpp
+++ b/server/red-worker.cpp
@@ -707,7 +707,7 @@ static void handle_dev_set_mouse_mode(void *opaque, void *payload)
     RedWorker *worker = (RedWorker*) opaque;
 
     spice_debug("mouse mode %u", msg->mode);
-    cursor_channel_set_mouse_mode(worker->cursor_channel, msg->mode);
+    worker->cursor_channel->set_mouse_mode(msg->mode);
 }
 
 static void dev_add_memslot(RedWorker *worker, QXLDevMemSlot mem_slot)