diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index d969a230b..985c3b985 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -7,10 +7,12 @@ class MessagesController < ApplicationController
     authorize @message
     success = false
 
+    if @message.valid?
+      message_json = create_pusher_payload(@message)
+      Pusher.trigger(@message.chat_channel.pusher_channels, "message-created", message_json)
+    end
     if @message.save
       begin
-        message_json = create_pusher_payload(@message)
-        Pusher.trigger(@message.chat_channel.pusher_channels, "message-created", message_json)
         @message.delay.send_push
         success = true
       rescue Pusher::Error => e
diff --git a/app/javascript/chat/channels.jsx b/app/javascript/chat/channels.jsx
index 6950122e5..008389c05 100644
--- a/app/javascript/chat/channels.jsx
+++ b/app/javascript/chat/channels.jsx
@@ -53,6 +53,7 @@ const Channels = ({ activeChannelId, chatChannels, handleSwitchChannel, expanded
 
     return (
       <button
+        key={channel.id}
         className='chatchanneltabbutton'
         onClick={handleSwitchChannel}
         data-channel-id={channel.id}
diff --git a/app/models/message.rb b/app/models/message.rb
index 82ed1f465..7a6b9f2ea 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -62,6 +62,10 @@ class Message < ApplicationRecord
   end
 
   def evaluate_channel_permission
+    if chat_channel_id.blank?
+      errors.add(:base, "Must be part of channel.")
+      return
+    end
     channel = ChatChannel.find(chat_channel_id)
     return if channel.channel_type == "open"
     if channel.has_member?(user)