diff --git a/src/components/structures/NotificationPanel.tsx b/src/components/structures/NotificationPanel.tsx
index 7e1566521d..3bfadf7110 100644
--- a/src/components/structures/NotificationPanel.tsx
+++ b/src/components/structures/NotificationPanel.tsx
@@ -31,7 +31,7 @@ interface IProps {
  * Component which shows the global notification list using a TimelinePanel
  */
 @replaceableComponent("structures.NotificationPanel")
-class NotificationPanel extends React.Component<IProps> {
+export default class NotificationPanel extends React.PureComponent<IProps> {
     render() {
         const emptyState = (<div className="mx_RightPanel_empty mx_NotificationPanel_empty">
             <h2>{_t('You’re all caught up')}</h2>
@@ -62,5 +62,3 @@ class NotificationPanel extends React.Component<IProps> {
         </BaseCard>;
     }
 }
-
-export default NotificationPanel;
diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index e3237d98a6..353f50ad34 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.tsx
@@ -295,13 +295,13 @@ export default class RightPanel extends React.Component<IProps, IState> {
                 break;
 
             case RightPanelPhases.NotificationPanel:
-                if (SettingsStore.getValue("feature_pinning")) {
-                    panel = <NotificationPanel onClose={this.onClose} />;
-                }
+                panel = <NotificationPanel onClose={this.onClose} />;
                 break;
 
             case RightPanelPhases.PinnedMessages:
-                panel = <PinnedMessagesCard room={this.props.room} onClose={this.onClose} />;
+                if (SettingsStore.getValue("feature_pinning")) {
+                    panel = <PinnedMessagesCard room={this.props.room} onClose={this.onClose} />;
+                }
                 break;
 
             case RightPanelPhases.FilePanel: