diff --git a/frontend/app/components/Spots/SpotsList/SpotsListHeader.tsx b/frontend/app/components/Spots/SpotsList/SpotsListHeader.tsx
index 11367cd88..061a6b79a 100644
--- a/frontend/app/components/Spots/SpotsList/SpotsListHeader.tsx
+++ b/frontend/app/components/Spots/SpotsList/SpotsListHeader.tsx
@@ -1,34 +1,21 @@
 import { Button, Input, Segmented } from 'antd';
 import { observer } from 'mobx-react-lite';
 import React from 'react';
-import { connect } from 'react-redux';
-
-import { downgradeScope } from 'App/duck/user';
 import { useStore } from 'App/mstore';
 import { debounce } from 'App/utils';
 import { Icon } from 'UI';
 
-const DebugDowngrade = connect(null, { downgradeScope })(
-  ({ downgradeScope }: any) => (
-    <Button onClick={downgradeScope}>DEBUG: downgrade account scope</Button>
-  )
-);
-
 const SpotsListHeader = observer(
   ({
     onDelete,
     selectedCount,
     onClearSelection,
     isEmpty,
-    toggleEmptyState,
-    isEmptyState,
   }: {
     onDelete: () => void;
     selectedCount: number;
     onClearSelection: () => void;
     isEmpty?: boolean;
-    toggleEmptyState?: () => void;
-    isEmptyState?: boolean;
   }) => {
     const { spotStore } = useStore();
 
@@ -61,10 +48,6 @@ const SpotsListHeader = observer(
         <div className="flex gap-1 items-center">
           <Icon name={'orSpot'} size={24} />
           <h1 className={'text-2xl capitalize mr-2'}>Spot List</h1>
-          <Button onClick={toggleEmptyState}>
-            DEBUG: empty state {isEmptyState ? 'ON' : 'OFF'}
-          </Button>
-          <DebugDowngrade />
         </div>
 
         {isEmpty ? null : (
diff --git a/frontend/app/components/Spots/SpotsList/index.tsx b/frontend/app/components/Spots/SpotsList/index.tsx
index de389c761..35380c805 100644
--- a/frontend/app/components/Spots/SpotsList/index.tsx
+++ b/frontend/app/components/Spots/SpotsList/index.tsx
@@ -1,8 +1,8 @@
+import withPageTitle from 'HOCs/withPageTitle';
 import { message } from 'antd';
 import { observer } from 'mobx-react-lite';
 import React from 'react';
 
-import withPageTitle from 'HOCs/withPageTitle';
 import withPermissions from 'App/components/hocs/withPermissions';
 import { useStore } from 'App/mstore';
 import { numberWithCommas } from 'App/utils';
@@ -16,7 +16,6 @@ import SpotsListHeader from './SpotsListHeader';
 
 function SpotsList() {
   const [selectedSpots, setSelectedSpots] = React.useState<string[]>([]);
-  const [isEmptyState, setIsEmpty] = React.useState(false);
   const { spotStore } = useStore();
 
   React.useEffect(() => {
@@ -74,7 +73,7 @@ function SpotsList() {
   };
 
   const isLoading = spotStore.isLoading;
-  const isEmpty = isEmptyState || spotStore.total === 0 && spotStore.query === ''
+  const isEmpty = spotStore.total === 0 && spotStore.query === '';
   return (
     <div className={'relative w-full mx-auto'} style={{ maxWidth: 1360 }}>
       <div
@@ -87,8 +86,6 @@ function SpotsList() {
           selectedCount={selectedSpots.length}
           onClearSelection={clearSelection}
           isEmpty={isEmpty}
-          isEmptyState={isEmptyState}
-          toggleEmptyState={() => setIsEmpty(!isEmptyState)}
         />
       </div>
 
@@ -163,5 +160,6 @@ function SpotsList() {
   );
 }
 
-export default withPermissions(['SPOT'])(withPageTitle('Spot List - OpenReplay')(observer(SpotsList)));
-
+export default withPermissions(['SPOT'])(
+  withPageTitle('Spot List - OpenReplay')(observer(SpotsList))
+);