diff --git a/client/scripts/components/Icons/InfinityIcon.js b/client/scripts/components/Icons/InfinityIcon.js
new file mode 100644
index 00000000..b94f3f26
--- /dev/null
+++ b/client/scripts/components/Icons/InfinityIcon.js
@@ -0,0 +1,14 @@
+import React from 'react';
+
+import BaseIcon from './BaseIcon';
+
+export default class InfinityIcon extends BaseIcon {
+  render() {
+    return (
+      <svg className={`icon icon--infinity ${this.props.className}`}
+        viewBox={this.getViewBox()}>
+        <path d="M30,33.17l-5.84,5.16a12.2,12.2,0,0,1-8.27,3.46,11.32,11.32,0,0,1-8.39-3.51,11.66,11.66,0,0,1,0-16.6,11.45,11.45,0,0,1,8.36-3.46,12.06,12.06,0,0,1,8.27,3.46L30,26.77l5.84-5.1a12.4,12.4,0,0,1,8.33-3.46A11.9,11.9,0,0,1,56,30a11.41,11.41,0,0,1-3.46,8.27,11.32,11.32,0,0,1-8.39,3.51,12.26,12.26,0,0,1-8.33-3.46ZM26.46,30l-5.61-5a7.4,7.4,0,0,0-5-2.1,6.81,6.81,0,0,0-5,2.1,6.81,6.81,0,0,0-2.1,5,6.88,6.88,0,0,0,2.07,5,6.74,6.74,0,0,0,5,2.12,7.39,7.39,0,0,0,5-2.1Zm6.91-.06,5.78,5a7.47,7.47,0,0,0,5,2.1,6.79,6.79,0,0,0,5-2.1,6.86,6.86,0,0,0,2.07-5,6.79,6.79,0,0,0-2.1-5,6.86,6.86,0,0,0-5-2.07,7.62,7.62,0,0,0-5,2.1Z" />
+      </svg>
+    );
+  }
+}
diff --git a/client/scripts/components/Sidebar/TransferRateDetails.js b/client/scripts/components/Sidebar/TransferRateDetails.js
index c2109d56..cfe7fc98 100644
--- a/client/scripts/components/Sidebar/TransferRateDetails.js
+++ b/client/scripts/components/Sidebar/TransferRateDetails.js
@@ -1,14 +1,15 @@
 import classnames from 'classnames';
-import {FormattedMessage} from 'react-intl';
 import React from 'react';
 
 import Download from '../Icons/Download';
 import Duration from '../General/Duration';
+import InfinityIcon from '../Icons/InfinityIcon';
 import Size from '../General/Size';
 import Upload from '../Icons/Upload';
 
 const icons = {
   download: <Download />,
+  infinity: <InfinityIcon />,
   upload: <Upload />
 };
 
@@ -65,12 +66,9 @@ class TransferRateDetails extends React.Component {
 
     let limit = null;
 
-    console.log(throttles[slug]);
     if (throttles[slug] === 0) {
-      console.log('zero')
-      limit = <FormattedMessage id="unit.time.infinity" defaultMessage="∞" />;
+      limit = icons.infinity;
     } else {
-      console.log('not zero')
       limit = <Size value={throttles[slug]} isSpeed={true} />;
     }
 
diff --git a/client/scripts/components/Sidebar/TransferRateGraph.js b/client/scripts/components/Sidebar/TransferRateGraph.js
index a7318a5b..5224f222 100644
--- a/client/scripts/components/Sidebar/TransferRateGraph.js
+++ b/client/scripts/components/Sidebar/TransferRateGraph.js
@@ -30,14 +30,17 @@ class LineChart extends React.Component {
   }
 
   shouldComponentUpdate(nextProps) {
+    const {props: {historicalData = {}}} = this;
+    const {historicalData: {upload = [], download = []}} = nextProps;
+
     if (this.isInitialRender) {
-      this.isInitialRender = false;
+      if (upload != null && upload.length > 0) {
+        this.isInitialRender = false;
+      }
+
       return true;
     }
 
-    const {props: {historicalData}} = this;
-    const {historicalData: {upload, download}} = nextProps;
-
     return upload.some((item, index) => {
       return item !== historicalData.upload[index];
     }) || download.some((item, index) => {