diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 3489d747c..11e50f945 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -1741,6 +1741,7 @@ var InternalClient = (function () {
 					var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
 					if (channel) {
 						var msg = channel.messages.add(new _StructuresMessage2["default"](data, channel, client));
+						channel.lastMessageID = msg.id;
 
 						if (self.messageAwaits[channel.id + msg.author.id]) {
 							self.messageAwaits[channel.id + msg.author.id].map(function (fn) {
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index ecdf2eed8..970fc2745 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1487,6 +1487,7 @@ export default class InternalClient {
 					var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
 					if (channel) {
 						var msg = channel.messages.add(new Message(data, channel, client));
+						channel.lastMessageID = msg.id;
 
 						if (self.messageAwaits[channel.id + msg.author.id]) {
 							self.messageAwaits[channel.id + msg.author.id].map( fn => fn(msg) );