diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 53ffeb400b..cc2e37fa88 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -102,7 +102,12 @@ module.exports = React.createClass({
             currentUserCss = "current--user";
         }
 
-        var timestamp = UserStore.getProfile(post.user_id).update_at;
+        var userProfile = UserStore.getProfile(post.user_id);
+
+        var timestamp = UserStore.getCurrentUser().update_at;
+        if (userProfile) {
+            timestamp = userProfile.update_at;
+        }
 
         return (
             <div>