diff --git a/server/cursor-channel-client.h b/server/cursor-channel-client.h
index c3f1935c..6ae50e96 100644
--- a/server/cursor-channel-client.h
+++ b/server/cursor-channel-client.h
@@ -40,6 +40,10 @@ public:
     void reset_cursor_cache();
     RedCacheItem* cache_find(uint64_t id);
     int cache_add(uint64_t id, size_t size);
+    CursorChannel* get_channel()
+    {
+        return CURSOR_CHANNEL(CommonGraphicsChannelClient::get_channel());
+    }
 
 protected:
     virtual void on_disconnect() override;
diff --git a/server/cursor-channel.cpp b/server/cursor-channel.cpp
index 2b2e0cf0..da221ca2 100644
--- a/server/cursor-channel.cpp
+++ b/server/cursor-channel.cpp
@@ -119,7 +119,7 @@ static void red_marshall_cursor_init(CursorChannelClient *ccc, SpiceMarshaller *
     CursorChannel *cursor_channel;
     SpiceMsgCursorInit msg;
 
-    cursor_channel = CURSOR_CHANNEL(ccc->get_channel());
+    cursor_channel = ccc->get_channel();
 
     ccc->init_send_data(SPICE_MSG_CURSOR_INIT);
     msg.visible = cursor_channel->cursor_visible;
@@ -135,7 +135,7 @@ static void red_marshall_cursor(CursorChannelClient *ccc,
                                 SpiceMarshaller *m,
                                 RedCursorPipeItem *cursor_pipe_item)
 {
-    CursorChannel *cursor_channel = CURSOR_CHANNEL(ccc->get_channel());
+    CursorChannel *cursor_channel = ccc->get_channel();
     RedCursorPipeItem *item = cursor_pipe_item;
     RedCursorCmd *cmd;