diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index d408b9046..466a11a32 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -1624,7 +1624,7 @@ var InternalClient = (function () {
 
 			_this33.intervals.typing[channel.id] = setInterval(function () {
 				return _this33.sendTyping(channel)["catch"](function (error) {
-					return _this33.emit("error", error);
+					return _this33.client.emit("error", error);
 				});
 			}, 4000);
 
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index a53d8b5f9..8e796cb78 100755
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1405,7 +1405,7 @@ export default class InternalClient {
 
 			this.intervals.typing[channel.id] = setInterval(
 				() => this.sendTyping(channel)
-				.catch(error => this.emit("error", error)),
+				.catch(error => this.client.emit("error", error)),
 				4000
 			);