diff --git a/ui/src/admin/containers/AdminPage.js b/ui/src/admin/containers/AdminPage.js
index de4e936b96..65e448d469 100644
--- a/ui/src/admin/containers/AdminPage.js
+++ b/ui/src/admin/containers/AdminPage.js
@@ -154,7 +154,7 @@ class AdminPage extends Component {
               <h1 className="page-header__title">Admin</h1>
             </div>
             <div className="page-header__right">
-              <SourceIndicator sourceName={source.name} />
+              <SourceIndicator />
             </div>
           </div>
         </div>
diff --git a/ui/src/alerts/containers/AlertsApp.js b/ui/src/alerts/containers/AlertsApp.js
index 34140b11f4..16330dbabb 100644
--- a/ui/src/alerts/containers/AlertsApp.js
+++ b/ui/src/alerts/containers/AlertsApp.js
@@ -156,7 +156,7 @@ class AlertsApp extends Component {
                 <h1 className="page-header__title">Alert History</h1>
               </div>
               <div className="page-header__right">
-                <SourceIndicator sourceName={source.name} />
+                <SourceIndicator />
                 <CustomTimeRangeDropdown
                   onApplyTimeRange={this.handleApplyTime}
                   timeRange={timeRange}
diff --git a/ui/src/dashboards/components/DashboardHeader.js b/ui/src/dashboards/components/DashboardHeader.js
index a7bd5436a7..ff670787fd 100644
--- a/ui/src/dashboards/components/DashboardHeader.js
+++ b/ui/src/dashboards/components/DashboardHeader.js
@@ -18,7 +18,6 @@ const DashboardHeader = ({
   handleChooseTimeRange,
   handleChooseAutoRefresh,
   handleClickPresentationButton,
-  source,
   onAddCell,
   onEditDashboard,
   onToggleTempVarControls,
@@ -49,7 +48,7 @@ const DashboardHeader = ({
           </div>
           <div className="page-header__right">
             <GraphTips />
-            <SourceIndicator sourceName={source.name} />
+            <SourceIndicator />
             {dashboard
               ? <button className="btn btn-primary btn-sm" onClick={onAddCell}>
                   <span className="icon plus" />
@@ -107,7 +106,6 @@ DashboardHeader.defaultProps = {
 }
 
 DashboardHeader.propTypes = {
-  sourceID: string,
   children: array,
   buttonText: string,
   dashboard: shape({}),
@@ -121,7 +119,6 @@ DashboardHeader.propTypes = {
   handleChooseTimeRange: func.isRequired,
   handleChooseAutoRefresh: func.isRequired,
   handleClickPresentationButton: func.isRequired,
-  source: shape({}),
   onAddCell: func,
   onEditDashboard: func,
   onToggleTempVarControls: func,
diff --git a/ui/src/dashboards/components/DashboardsHeader.js b/ui/src/dashboards/components/DashboardsHeader.js
index a66d4021e5..d66b61f5eb 100644
--- a/ui/src/dashboards/components/DashboardsHeader.js
+++ b/ui/src/dashboards/components/DashboardsHeader.js
@@ -1,26 +1,17 @@
-import React, {PropTypes} from 'react'
+import React from 'react'
 
 import SourceIndicator from 'shared/components/SourceIndicator'
 
-const DashboardsHeader = ({sourceName}) => {
-  return (
-    <div className="page-header">
-      <div className="page-header__container">
-        <div className="page-header__left">
-          <h1 className="page-header__title">Dashboards</h1>
-        </div>
-        <div className="page-header__right">
-          <SourceIndicator sourceName={sourceName} />
-        </div>
+const DashboardsHeader = () =>
+  <div className="page-header">
+    <div className="page-header__container">
+      <div className="page-header__left">
+        <h1 className="page-header__title">Dashboards</h1>
+      </div>
+      <div className="page-header__right">
+        <SourceIndicator />
       </div>
     </div>
-  )
-}
-
-const {string} = PropTypes
-
-DashboardsHeader.propTypes = {
-  sourceName: string.isRequired,
-}
+  </div>
 
 export default DashboardsHeader
diff --git a/ui/src/data_explorer/containers/Header.js b/ui/src/data_explorer/containers/Header.js
index 32cd0e0bff..cbf79fc4f1 100644
--- a/ui/src/data_explorer/containers/Header.js
+++ b/ui/src/data_explorer/containers/Header.js
@@ -22,12 +22,6 @@ const Header = React.createClass({
     }).isRequired,
   },
 
-  contextTypes: {
-    source: shape({
-      name: string,
-    }),
-  },
-
   handleChooseTimeRange(bounds) {
     this.props.actions.setTimeRange(bounds)
   },
@@ -48,7 +42,7 @@ const Header = React.createClass({
           </div>
           <div className="page-header__right">
             <GraphTips />
-            <SourceIndicator sourceName={this.context.source.name} />
+            <SourceIndicator />
             <div
               className="btn btn-sm btn-default"
               onClick={showWriteForm}
diff --git a/ui/src/hosts/containers/HostsPage.js b/ui/src/hosts/containers/HostsPage.js
index fbfc4777fe..4c4e8eeb6d 100644
--- a/ui/src/hosts/containers/HostsPage.js
+++ b/ui/src/hosts/containers/HostsPage.js
@@ -84,7 +84,7 @@ export const HostsPage = React.createClass({
               <h1 className="page-header__title">Host List</h1>
             </div>
             <div className="page-header__right">
-              <SourceIndicator sourceName={source.name} />
+              <SourceIndicator />
             </div>
           </div>
         </div>
diff --git a/ui/src/kapacitor/components/KapacitorRules.js b/ui/src/kapacitor/components/KapacitorRules.js
index 611c36e0f1..16ed7769b0 100644
--- a/ui/src/kapacitor/components/KapacitorRules.js
+++ b/ui/src/kapacitor/components/KapacitorRules.js
@@ -99,7 +99,7 @@ const KapacitorRules = ({
   )
 }
 
-const PageContents = ({children, source}) =>
+const PageContents = ({children}) =>
   <div className="page">
     <div className="page-header">
       <div className="page-header__container">
@@ -109,7 +109,7 @@ const PageContents = ({children, source}) =>
           </h1>
         </div>
         <div className="page-header__right">
-          <SourceIndicator sourceName={source && source.name} />
+          <SourceIndicator />
         </div>
       </div>
     </div>
@@ -139,7 +139,6 @@ KapacitorRules.propTypes = {
 
 PageContents.propTypes = {
   children: node,
-  source: shape(),
   onCloseTickscript: func,
 }
 
diff --git a/ui/src/kapacitor/components/RuleHeaderSave.js b/ui/src/kapacitor/components/RuleHeaderSave.js
index 5d368133fe..be2c441373 100644
--- a/ui/src/kapacitor/components/RuleHeaderSave.js
+++ b/ui/src/kapacitor/components/RuleHeaderSave.js
@@ -4,14 +4,13 @@ import TimeRangeDropdown from 'shared/components/TimeRangeDropdown'
 import SourceIndicator from 'shared/components/SourceIndicator'
 
 const RuleHeaderSave = ({
-  source,
   onSave,
   timeRange,
   validationError,
   onChooseTimeRange,
 }) =>
   <div className="page-header__right">
-    <SourceIndicator sourceName={source.name} />
+    <SourceIndicator />
     <TimeRangeDropdown
       onChooseTimeRange={onChooseTimeRange}
       selected={timeRange}
@@ -41,7 +40,6 @@ const RuleHeaderSave = ({
 const {func, shape, string} = PropTypes
 
 RuleHeaderSave.propTypes = {
-  source: shape({}).isRequired,
   onSave: func.isRequired,
   validationError: string.isRequired,
   onChooseTimeRange: func.isRequired,
diff --git a/ui/src/kapacitor/components/TickscriptHeader.js b/ui/src/kapacitor/components/TickscriptHeader.js
index c6dcaee71d..d826fe43f3 100644
--- a/ui/src/kapacitor/components/TickscriptHeader.js
+++ b/ui/src/kapacitor/components/TickscriptHeader.js
@@ -11,7 +11,6 @@ const addName = list => list.map(l => ({...l, name: `${l.db}.${l.rp}`}))
 const TickscriptHeader = ({
   task: {id, type, dbrps},
   task,
-  source: {name},
   onSave,
   onChangeType,
   onChangeID,
@@ -26,7 +25,7 @@ const TickscriptHeader = ({
           : <TickscriptStaticID id={task.name} />}
       </div>
       <div className="page-header__right">
-        <SourceIndicator sourceName={name} />
+        <SourceIndicator />
         <TickscriptType type={type} onChangeType={onChangeType} />
         <MultiSelectDBDropdown
           selectedItems={addName(dbrps)}
@@ -48,7 +47,6 @@ const {arrayOf, bool, func, shape, string} = PropTypes
 
 TickscriptHeader.propTypes = {
   onSave: func,
-  source: shape(),
   onSelectDbrps: func.isRequired,
   task: shape({
     dbrps: arrayOf(
diff --git a/ui/src/sources/containers/ManageSources.js b/ui/src/sources/containers/ManageSources.js
index b1f400fd3a..3c27fe8825 100644
--- a/ui/src/sources/containers/ManageSources.js
+++ b/ui/src/sources/containers/ManageSources.js
@@ -62,7 +62,7 @@ class ManageSources extends Component {
               <h1 className="page-header__title">Configuration</h1>
             </div>
             <div className="page-header__right">
-              <SourceIndicator sourceName={source.name} />
+              <SourceIndicator />
             </div>
           </div>
         </div>
diff --git a/ui/src/sources/containers/SourcePage.js b/ui/src/sources/containers/SourcePage.js
index 0cf5d1cf68..d407203812 100644
--- a/ui/src/sources/containers/SourcePage.js
+++ b/ui/src/sources/containers/SourcePage.js
@@ -125,7 +125,7 @@ export const SourcePage = React.createClass({
               </h1>
             </div>
             <div className="page-header__right">
-              <SourceIndicator sourceName={source.name} />
+              <SourceIndicator />
             </div>
           </div>
         </div>
diff --git a/ui/src/status/containers/StatusPage.js b/ui/src/status/containers/StatusPage.js
index 5e07241d4c..50974161de 100644
--- a/ui/src/status/containers/StatusPage.js
+++ b/ui/src/status/containers/StatusPage.js
@@ -56,7 +56,7 @@ class StatusPage extends Component {
               <h1 className="page-header__title">Status</h1>
             </div>
             <div className="page-header__right">
-              <SourceIndicator sourceName={source.name} />
+              <SourceIndicator />
             </div>
           </div>
         </div>