diff --git a/src/Message.js b/src/Message.js
index bc2b45c..f907db5 100644
--- a/src/Message.js
+++ b/src/Message.js
@@ -37,16 +37,17 @@ export default class Message extends React.Component {
   shouldComponentUpdate(nextProps) {
     const next = nextProps.currentMessage;
     const current = this.props.currentMessage;
-    const nextCreatedAt = next.createdAt && next.createdAt;
-    const currentCreatedAt = current.createdAt && current.createdAt;
+    const { nextMessage } = this.props;
+    const nextPropsMessage = nextProps.nextMessage;
     return (
       next.send !== current.send ||
       next.received !== current.received ||
       next.pending !== current.pending ||
-      nextCreatedAt !== currentCreatedAt ||
+      next.createdAt !== current.createdAt ||
       next.text !== current.text ||
       next.image !== current.image ||
-      next.video !== current.video
+      next.video !== current.video ||
+      nextMessage !== nextPropsMessage
     );
   }