diff --git a/lattice/src/App/AuthFlow/SignOutButton.tsx b/lattice/src/App/AuthFlow/SignOutButton.tsx
index 3e76c22db..ff6b5e6ba 100644
--- a/lattice/src/App/AuthFlow/SignOutButton.tsx
+++ b/lattice/src/App/AuthFlow/SignOutButton.tsx
@@ -7,6 +7,7 @@ interface Props {
 
 const SignOutButton: React.FC<Props> = ({ children }) => {
   const signoutOnClick = (e) => {
+    localStorage.clear();
     window.location.href = '/logout';
   };
 
diff --git a/lattice/src/App/QueryBuilder/QueryBuilderContainer.tsx b/lattice/src/App/QueryBuilder/QueryBuilderContainer.tsx
index da27904de..3f7afb292 100644
--- a/lattice/src/App/QueryBuilder/QueryBuilderContainer.tsx
+++ b/lattice/src/App/QueryBuilder/QueryBuilderContainer.tsx
@@ -196,7 +196,8 @@ export const QueryBuilderContainer = () => {
 
   return (
     <Fragment>
-      {tables.length > 0 ? (
+      {/* check if tables is not null AND tables.length > 0 */}
+      {(tables && tables.length > 0) ? (
         <Split
           sizes={showBuilder ? colSizes : [0, 100]}
           cursor="col-resize"