diff --git a/src/client/chat--submitMessage.jsx b/src/client/chat--submitMessage.jsx
index b845722..019fe53 100644
--- a/src/client/chat--submitMessage.jsx
+++ b/src/client/chat--submitMessage.jsx
@@ -29,7 +29,6 @@ export default function ChatSubmitMessage() {
               channel,
               message: chunk,
               owner: '/r/anonymous' === channel ? 0 : user.id,
-              pending: true,
               timestamp: Date.now(),
               uuid: uuidv4(),
             }));
diff --git a/src/client/store/effects.js b/src/client/store/effects.js
index a2f975a..6e491ae 100644
--- a/src/client/store/effects.js
+++ b/src/client/store/effects.js
@@ -108,7 +108,7 @@ const effects = {
     socket.send(new Leave(payload), () => dispatch(leave({channel})));
   },
   [submitMessage]: async ({dispatch}, {payload}) => {
-    dispatch(addMessage(payload));
+    dispatch(addMessage({...payload, pending: true}));
     const reject = (ttr) => {
       dispatch(rejectMessage(payload.uuid));
       dispatch(addMessage({
diff --git a/src/common/state/chat.js b/src/common/state/chat.js
index 2844bfb..73bea02 100644
--- a/src/common/state/chat.js
+++ b/src/common/state/chat.js
@@ -76,6 +76,7 @@ const slice = createSlice({
       users.splice(users.indexOf(id), 1);
     },
     rejectMessage: ({messages}, {payload: uuid}) => {
+      delete messages[uuid].pending;
       messages[uuid].rejected = true;
     },
     removeMessage: (state, {payload: {channel, uuid}}) => {