2 files changed, 7 insertions, 1 deletions
diff --git a/vnext/src/App.js b/vnext/src/App.js
index 730deb19..3ca7e0bf 100644
--- a/vnext/src/App.js
+++ b/vnext/src/App.js
@@ -29,7 +29,7 @@ export default class App extends React.Component {
     }
     this.state = {
       visitor: {
-        uid: cookies.load('_juick_uid') || 0,
+        uid: Number(cookies.load('_juick_uid')),
         hash: cookies.load('hash')
       }
     };
diff --git a/vnext/src/components/Feeds.js b/vnext/src/components/Feeds.js
index 11466d23..89eb7774 100644
--- a/vnext/src/components/Feeds.js
+++ b/vnext/src/components/Feeds.js
@@ -72,6 +72,12 @@ class Feed extends React.Component {
   componentDidMount() {
     this.loadMessages(this.props.visitor.hash, this.props.location.search);
   }
+
+  shouldComponentUpdate(nextProps, nextState) {
+    return this.props.visitor.uid !== nextProps.visitor.uid
+    || this.state !== nextState || this.props.location !== nextProps.location;
+  }
+
   getSnapshotBeforeUpdate(prevProps) {
     return (this.props.location.search != prevProps.location.search
       || this.props.visitor != prevProps.visitor || this.props.query.search != prevProps.query.search);