diff --git a/webapp/components/permalink_view.jsx b/webapp/components/permalink_view.jsx
index 8e49019ee1..2ebe523562 100644
--- a/webapp/components/permalink_view.jsx
+++ b/webapp/components/permalink_view.jsx
@@ -28,18 +28,19 @@ export default class PermalinkView extends React.Component {
         const channel = ChannelStore.getCurrent();
         const channelId = channel ? channel.id : '';
         const channelName = channel ? channel.name : '';
-        const teamURL = TeamStore.getCurrentTeamUrl();
+        const team = TeamStore.getCurrent();
+        const teamName = team ? team.name : '';
         const profiles = JSON.parse(JSON.stringify(UserStore.getProfiles()));
         return {
             channelId,
             channelName,
             profiles,
-            teamURL,
+            teamName,
             postId
         };
     }
     isStateValid() {
-        return this.state.channelId !== '' && this.state.profiles && this.state.teamURL;
+        return this.state.channelId !== '' && this.state.profiles && this.state.teamName;
     }
     updateState() {
         this.setState(this.getStateFromStores(this.props));
@@ -64,7 +65,7 @@ export default class PermalinkView extends React.Component {
             return true;
         }
 
-        if (nextState.teamURL !== this.state.teamURL) {
+        if (nextState.teamName !== this.state.teamName) {
             return true;
         }
 
@@ -87,7 +88,7 @@ export default class PermalinkView extends React.Component {
                     id='archive-link-home'
                 >
                     <Link
-                        to={this.state.teamURL + '/channels/' + this.state.channelName}
+                        to={'/' + this.state.teamName + '/channels/' + this.state.channelName}
                     >
                         <FormattedMessage
                             id='center_panel.recent'
diff --git a/webapp/components/posts_view.jsx b/webapp/components/posts_view.jsx
index e034a592e6..647c7f086a 100644
--- a/webapp/components/posts_view.jsx
+++ b/webapp/components/posts_view.jsx
@@ -384,6 +384,7 @@ export default class PostsView extends React.Component {
     }
     componentWillUnmount() {
         window.removeEventListener('resize', this.handleResize);
+        this.scrollStopAction.cancel();
     }
     componentDidUpdate() {
         if (this.props.postList != null) {
diff --git a/webapp/utils/delayed_action.jsx b/webapp/utils/delayed_action.jsx
index 4f6239ad02..c3b1647333 100644
--- a/webapp/utils/delayed_action.jsx
+++ b/webapp/utils/delayed_action.jsx
@@ -24,4 +24,8 @@ export default class DelayedAction {
 
         this.timer = window.setTimeout(this.fire, timeout);
     }
+
+    cancel() {
+        window.clearTimeout(this.timer);
+    }
 }