diff --git a/frontend/src/component/feature/list-component.jsx b/frontend/src/component/feature/list-component.jsx
index 2de43097cf..773825ba54 100644
--- a/frontend/src/component/feature/list-component.jsx
+++ b/frontend/src/component/feature/list-component.jsx
@@ -3,7 +3,7 @@ import Feature from './feature-component';
 import { Link } from 'react-router';
 import { List, ListItem, ListSubHeader, ListDivider } from 'react-toolbox/lib/list';
 
-export default class FeatureListComponent extends React.Component {
+export default class FeatureListComponent extends React.PureComponent {
 
     static propTypes () {
         return {
diff --git a/frontend/src/component/history/history-component.jsx b/frontend/src/component/history/history-component.jsx
index 39c2a9f430..153fa140e2 100644
--- a/frontend/src/component/history/history-component.jsx
+++ b/frontend/src/component/history/history-component.jsx
@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
+import React, { PureComponent } from 'react';
 import HistoryList from './history-list-container';
 
-class History extends Component {
+class History extends PureComponent {
 
     componentDidMount () {
         this.props.fetchHistory();
diff --git a/frontend/src/component/history/history-item.jsx b/frontend/src/component/history/history-item.jsx
index 0e3647440f..108d542934 100644
--- a/frontend/src/component/history/history-item.jsx
+++ b/frontend/src/component/history/history-item.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes, Component } from 'react';
+import React, { PropTypes, PureComponent } from 'react';
 
 import FontIcon from 'react-toolbox/lib/font_icon';
 
@@ -70,7 +70,7 @@ function buildDiff (diff, idx) {
     return (<div key={idx}>{change}</div>);
 }
 
-class HistoryItem extends Component {
+class HistoryItem extends PureComponent {
 
     static propTypes () {
         return {