diff --git a/spotlight-client/src/LocalityFilterSelect/LocalityFilterSelect.tsx b/spotlight-client/src/LocalityFilterSelect/LocalityFilterSelect.tsx
index 6d92611a..0a3a1775 100644
--- a/spotlight-client/src/LocalityFilterSelect/LocalityFilterSelect.tsx
+++ b/spotlight-client/src/LocalityFilterSelect/LocalityFilterSelect.tsx
@@ -38,6 +38,11 @@ const LocalityFilterSelect: React.FC<LocalityFilterSelectProps> = ({
     metric.localityId = newFilter;
   });
 
+  // if there are no locality entries, don't display the dropdown. We are skipping this for Idaho launch. See https://github.com/Recidiviz/public-dashboard/issues/582
+  if (metric.localityLabels.entries.length === 0) {
+    return null;
+  }
+
   return (
     <Dropdown
       label={metric.localityLabels.label}
diff --git a/spotlight-client/src/VizControls/VizControls.tsx b/spotlight-client/src/VizControls/VizControls.tsx
index a2efa5a1..c3d64673 100644
--- a/spotlight-client/src/VizControls/VizControls.tsx
+++ b/spotlight-client/src/VizControls/VizControls.tsx
@@ -51,6 +51,10 @@ const FilterWrapper = styled.div`
   &:last-child {
     margin-right: 0;
   }
+
+  &:empty {
+    margin-right: 0;
+  }
 `;
 
 const Button = styled.button`