diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js
index a5834cfca..887a7ce77 100644
--- a/src/components/Layout/Layout.js
+++ b/src/components/Layout/Layout.js
@@ -18,10 +18,13 @@ class Layout extends Component {
   }
 }
 
-const mapStateToProps = ({ loadUser }) => {
+const mapStateToProps = ({ loadUser, projectState, projectSearch }) => {
+  const projectDetailApiCheck = !projectState.isLoading && !!projectState.error
+  const projectListingApiCheck = !projectSearch.isLoading && !!projectSearch.error
   return {
     user : loadUser.user,
-    isLoadingUser: loadUser.isLoading
+    isLoadingUser: loadUser.isLoading,
+    maintenanceMode: projectDetailApiCheck || projectListingApiCheck
   }
 }
 
diff --git a/src/components/Layout/Layout.jsx b/src/components/Layout/Layout.jsx
index 0ecec29e7..9152b970c 100644
--- a/src/components/Layout/Layout.jsx
+++ b/src/components/Layout/Layout.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import Footer from '../Footer/Footer'
-import { MAINTENANCE_MODE } from '../../config/constants'
+// import { MAINTENANCE_MODE } from '../../config/constants'
 import Alert from 'react-s-alert'
 import cn from 'classnames'
 import Maintenance from '../Maintenance/Maintenance'
@@ -12,11 +12,11 @@ import '../../styles/vendors/s-alert-default.css'
 import 'react-s-alert/dist/s-alert-css-effects/stackslide.css'
 
 const Layout = (props) => {
-  const { isLoadingUser } = props
+  const { isLoadingUser, maintenanceMode } = props
 
   if (isLoadingUser) {
     return (<div />)
-  } else if (MAINTENANCE_MODE) {
+  } else if (maintenanceMode) {
     return <Maintenance />
   } else {
     return (
diff --git a/src/config/projectQuestions/enterprise_mobile.v1.0.js b/src/config/projectQuestions/enterprise_mobile.v1.0.js
index 88b75ef24..cea2475f3 100644
--- a/src/config/projectQuestions/enterprise_mobile.v1.0.js
+++ b/src/config/projectQuestions/enterprise_mobile.v1.0.js
@@ -337,7 +337,7 @@ const sections = [
               { value: 'confidential', label: 'Confidential Information, Sensitive Financial Data or Personally Identifiable Information (PII) - Will the user be working directly with financial or other protected information such has health records?'},
               { value: 'mdm', label: 'Mobile Device Management (MDM) - Do you employ an MDM solution? If yes, what service do you use?'}
             ],
-            description: 'Please select each required security requirement above.',
+            description: 'Please select each required security requirement above.'
           },
           {
             icon: 'question',