diff --git a/client/app/scripts/components/metric-selector.js b/client/app/scripts/components/metric-selector.js
index f8e81eaa1..cd04c94a3 100644
--- a/client/app/scripts/components/metric-selector.js
+++ b/client/app/scripts/components/metric-selector.js
@@ -18,10 +18,11 @@ class MetricSelector extends React.Component {
 
   render() {
     const { alwaysPinned, availableMetrics } = this.props;
+    const hasMetrics = !availableMetrics.isEmpty();
 
     return (
       <div className="metric-selector">
-        <div className="metric-selector-wrapper" onMouseLeave={this.onMouseOut}>
+        {hasMetrics && <div className="metric-selector-wrapper" onMouseLeave={this.onMouseOut}>
           {availableMetrics.map(metric => (
             <MetricSelectorItem
               key={metric.get('id')}
@@ -29,7 +30,7 @@ class MetricSelector extends React.Component {
               metric={metric}
             />
           ))}
-        </div>
+        </div>}
       </div>
     );
   }