diff --git a/CHANGELOG.md b/CHANGELOG.md
index a46dc11..7ede2ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project are documented below.
 
 The format is based on [keep a changelog](http://keepachangelog.com/) and this project uses [semantic versioning](http://semver.org/).
 
+### [2.1.7]
+### Fixed
+- Fixed cacheable cursor parsing in  `ChannelMessageList`.
+
 ### [2.1.6]
 ### Added
 - Added a cachable cursor to `ChannelMessageList`.
diff --git a/packages/nakama-js-test/socket-channel.test.ts b/packages/nakama-js-test/socket-channel.test.ts
index 4476112..1197e60 100644
--- a/packages/nakama-js-test/socket-channel.test.ts
+++ b/packages/nakama-js-test/socket-channel.test.ts
@@ -16,6 +16,7 @@
 
 
 import * as nakamajs from "@heroiclabs/nakama-js";
+import { isExportDeclaration } from "typescript";
 import * as nakamajsprotobuf from "../nakama-js-protobuf";
 import {generateid, createPage, adapters, AdapterType} from "./utils";
 
@@ -165,9 +166,13 @@ describe('Channel Tests', () => {
       return await client.listChannelMessages(session, ack2.channel_id, 10)
     }, customid, channelid, payload, updatedPayload, adapter);
 
+    console.log(response);
+
     expect(response).not.toBeNull();
     expect(response.messages).not.toBeNull();
     expect(response.messages.length).toBe(1);
+    expect(response.cacheable_cursor).not.toBeNull();
+    expect(response.cacheable_cursor).not.toBeUndefined();
 
     response.messages.forEach(message => {
       expect(message.content).toEqual(updatedPayload);
diff --git a/packages/nakama-js/client.ts b/packages/nakama-js/client.ts
index d5cde5d..24be1ae 100644
--- a/packages/nakama-js/client.ts
+++ b/packages/nakama-js/client.ts
@@ -765,7 +765,8 @@ export class Client {
       var result: ChannelMessageList = {
         messages: [],
         next_cursor: response.next_cursor,
-        prev_cursor: response.prev_cursor
+        prev_cursor: response.prev_cursor,
+        cacheable_cursor: response.cacheable_cursor
       };
 
       if (response.messages == null) {
diff --git a/packages/nakama-js/dist/nakama-js.cjs.js b/packages/nakama-js/dist/nakama-js.cjs.js
index 46af3d4..e448dad 100644
--- a/packages/nakama-js/dist/nakama-js.cjs.js
+++ b/packages/nakama-js/dist/nakama-js.cjs.js
@@ -2045,7 +2045,8 @@ var Client = class {
       var result = {
         messages: [],
         next_cursor: response.next_cursor,
-        prev_cursor: response.prev_cursor
+        prev_cursor: response.prev_cursor,
+        cacheable_cursor: response.cacheable_cursor
       };
       if (response.messages == null) {
         return Promise.resolve(result);
diff --git a/packages/nakama-js/dist/nakama-js.esm.js b/packages/nakama-js/dist/nakama-js.esm.js
index db340ab..197866b 100644
--- a/packages/nakama-js/dist/nakama-js.esm.js
+++ b/packages/nakama-js/dist/nakama-js.esm.js
@@ -2034,7 +2034,8 @@ var Client = class {
       var result = {
         messages: [],
         next_cursor: response.next_cursor,
-        prev_cursor: response.prev_cursor
+        prev_cursor: response.prev_cursor,
+        cacheable_cursor: response.cacheable_cursor
       };
       if (response.messages == null) {
         return Promise.resolve(result);
diff --git a/packages/nakama-js/dist/nakama-js.iife.js b/packages/nakama-js/dist/nakama-js.iife.js
index e1c1be4..d98fdba 100644
--- a/packages/nakama-js/dist/nakama-js.iife.js
+++ b/packages/nakama-js/dist/nakama-js.iife.js
@@ -2047,7 +2047,8 @@ var nakamajs = (() => {
         var result = {
           messages: [],
           next_cursor: response.next_cursor,
-          prev_cursor: response.prev_cursor
+          prev_cursor: response.prev_cursor,
+          cacheable_cursor: response.cacheable_cursor
         };
         if (response.messages == null) {
           return Promise.resolve(result);
diff --git a/packages/nakama-js/dist/nakama-js.umd.js b/packages/nakama-js/dist/nakama-js.umd.js
index f17acb9..69ec905 100644
--- a/packages/nakama-js/dist/nakama-js.umd.js
+++ b/packages/nakama-js/dist/nakama-js.umd.js
@@ -2444,7 +2444,8 @@
               var result = {
                   messages: [],
                   next_cursor: response.next_cursor,
-                  prev_cursor: response.prev_cursor
+                  prev_cursor: response.prev_cursor,
+                  cacheable_cursor: response.cacheable_cursor
               };
               if (response.messages == null) {
                   return Promise.resolve(result);
diff --git a/packages/nakama-js/package.json b/packages/nakama-js/package.json
index bb5b006..e876eb9 100644
--- a/packages/nakama-js/package.json
+++ b/packages/nakama-js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@heroiclabs/nakama-js",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "scripts": {
         "build": "node build.js"
     },