diff --git a/src/apps/properties/src/components/WebsiteCreate/WebsiteCreate.less b/src/apps/properties/src/components/WebsiteCreate/WebsiteCreate.less
index 207b0862..d7c580d6 100644
--- a/src/apps/properties/src/components/WebsiteCreate/WebsiteCreate.less
+++ b/src/apps/properties/src/components/WebsiteCreate/WebsiteCreate.less
@@ -2,7 +2,7 @@
 @import '~@zesty-io/core/typography.less';
 
 .WebsiteCreate {
-  background: lighten(#f2f4fb, 2.5%);
+  background: lighten(@appBkgColor, 2.5%);
   word-break: break-word;
   display: flex;
   flex-direction: column;
@@ -22,15 +22,15 @@
 
   header {
     padding: 1rem;
-    background: lighten(#f2f4fb, 2%);
-    border-bottom: 1px solid #f2f4fb;
+    background: lighten(@appBkgColor, 2%);
+    border-bottom: 1px solid @appBkgColor;
     .name {
       font-size: 1.1em;
     }
   }
 
   main {
-    border-bottom: 1px solid #f2f4fb;
+    border-bottom: 1px solid @appBkgColor;
     padding: 1rem;
     flex: 1 0 350px;
     p {
diff --git a/src/apps/properties/src/views/PropertiesList/PropertiesList.js b/src/apps/properties/src/views/PropertiesList/PropertiesList.js
index 7b406d7f..7c95a999 100644
--- a/src/apps/properties/src/views/PropertiesList/PropertiesList.js
+++ b/src/apps/properties/src/views/PropertiesList/PropertiesList.js
@@ -111,12 +111,6 @@ export default connect((state, props) => {
           ) : (
             <ColumnList {...this.props} />
           )}
-
-          {!this.props.sites.length ? (
-            <main className={styles.siteList}>
-              <WebsiteCreate />
-            </main>
-          ) : null}
         </section>
       )
     }
diff --git a/src/apps/properties/src/views/PropertiesList/components/GridList/GridList.js b/src/apps/properties/src/views/PropertiesList/components/GridList/GridList.js
index ca9a42e2..689507f6 100644
--- a/src/apps/properties/src/views/PropertiesList/components/GridList/GridList.js
+++ b/src/apps/properties/src/views/PropertiesList/components/GridList/GridList.js
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useEffect } from 'react'
 import { Route } from 'react-router-dom'
 import { connect } from 'react-redux'
 
@@ -115,7 +115,7 @@ export default connect(state => state)(props => {
         </h2>
 
         <main className={styles.siteList}>
-          {props.sites.length === 0 && <WebsiteCreate />}
+          {Object.keys(props.sites).length === 0 && <WebsiteCreate />}
 
           {props.sitesFiltered.length ? (
             props.sitesFiltered.map(site => {