diff --git a/src/components/side-panel/layer-panel/layer-column-config.tsx b/src/components/side-panel/layer-panel/layer-column-config.tsx
index 817fea935d..0206123478 100644
--- a/src/components/side-panel/layer-panel/layer-column-config.tsx
+++ b/src/components/side-panel/layer-panel/layer-column-config.tsx
@@ -79,6 +79,11 @@ function LayerColumnConfigFactory(ColumnSelector: ReturnType<typeof ColumnSelect
       [updateLayerConfig, columnPairs, assignColumnPairs, assignColumn]
     );
 
+    if (!Object.keys(columns).length) {
+      // don't render if columns is empty
+      return <div />;
+    }
+
     return (
       <div>
         <SidePanelSection>