diff --git a/lib/client.js b/lib/client.js
index b605963..85397f5 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -151,7 +151,7 @@ client.prototype.handleMessage = function handleMessage(message) {
                 // Connected to server..
                 case "372":
                     this.log.info("Connected to server.");
-                    this.userstate["#jtv"] = {};
+                    this.userstate["#tmijs"] = {};
                     this.emits(["connected", "_promiseConnect"], [[this.server, this.port], [null]]);
                     this.reconnections = 0;
                     this.reconnectTimer = this.reconnectInterval;
@@ -572,7 +572,7 @@ client.prototype.handleMessage = function handleMessage(message) {
                         var months = _.get(~~message.tags["msg-param-months"], null);
                         var prime = message.tags["system-msg"].includes('Twitch\\sPrime');
                         var userstate = null;
-                        
+
                         if (msg) {
                             userstate = message.tags;
                             userstate['message-type'] = 'resub';
diff --git a/lib/commands.js b/lib/commands.js
index 3e853a4..a61ccae 100644
--- a/lib/commands.js
+++ b/lib/commands.js
@@ -149,7 +149,7 @@ module.exports = {
         newColor = _.get(newColor, channel);
 
         // Send the command to the server and race the Promise against a delay..
-        return this._sendCommand(this._getPromiseDelay(), "#jtv", `/color ${newColor}`, (resolve, reject) => {
+        return this._sendCommand(this._getPromiseDelay(), "#tmijs", `/color ${newColor}`, (resolve, reject) => {
             // Received _promiseColor event, resolve or reject..
             this.once("_promiseColor", (err) => {
                 if (!err) { resolve([newColor]); }
@@ -469,7 +469,7 @@ module.exports = {
         }
 
         // Send the command to the server and race the Promise against a delay..
-        return this._sendCommand(this._getPromiseDelay(), "#jtv", `/w ${username} ${message}`, (resolve, reject) => {
+        return this._sendCommand(this._getPromiseDelay(), "#tmijs", `/w ${username} ${message}`, (resolve, reject) => {
             var from = _.channel(username),
                 userstate = _.merge({
                         "message-type": "whisper",