diff --git a/app/components/channel-feed.jsx b/app/components/channel-feed.jsx
index ad1d846..a3c1850 100644
--- a/app/components/channel-feed.jsx
+++ b/app/components/channel-feed.jsx
@@ -44,23 +44,15 @@ export default function ChannelFeed(props) {
             try {
                 const update = JSON.parse(newMessageJson.message);
 
+                if (update.user.handle == channel.user.handle) {
+                    return;
+                }
+
                 if (messages.length > 0) {
 
                     const idx = messages.length - 1;
                     const last = messages[idx];
 
-                    let i = 0;
-
-                    while (i < messages.length) {
-                        const msg = messages[i];
-
-                        if (!!msg.optimistic && msg.user.handle == update.user.handle && msg.text == update.text) {
-                            return;
-                        }
-
-                        i++;
-                    }
-
                     if (last.id == update.id) {
 
                         let mp = [...messages];