diff --git a/client/components/welcome/index.jsx b/client/components/welcome/index.jsx
index f402a57..beeb2e6 100644
--- a/client/components/welcome/index.jsx
+++ b/client/components/welcome/index.jsx
@@ -1,11 +1,40 @@
 
 import React from 'react'
+import {connect} from 'react-redux'
 
 import PageHeader from 'components/page-header'
 
 import Lookup from 'components/lookup'
 import LookupSummary from 'components/lookup/results-summary'
 
+class LookupView extends React.Component {
+  render() {
+    if (this.props.enabled == false) {
+      return null;
+    }
+
+    return (
+      <div className="lookup-container">
+       <div className="col-md-8">
+         <Lookup />
+       </div>
+       <div className="col-md-4">
+         <LookupSummary />
+       </div>
+      </div>
+    );
+  }
+}
+
+const LookupPage = connect(
+  (state) => {
+    return {
+      enabled: state.config.prefix_lookup_enabled
+    }
+  }
+)(LookupView);
+
+
 export default class Welcome extends React.Component {
   render() {
     return (
@@ -17,14 +46,10 @@ export default class Welcome extends React.Component {
          <p>Your friendly bird looking glass</p>
        </div>
 
-       <div className="col-md-8">
-         <Lookup />
-       </div>
-       <div className="col-md-4">
-         <LookupSummary />
-       </div>
+       <LookupPage />
+
       </div>
-    )
+    );
   }
 }