diff --git a/src/Models/ThemeViewState.ts b/src/Models/ThemeViewState.ts
index 9962c6b90..2086dcef6 100644
--- a/src/Models/ThemeViewState.ts
+++ b/src/Models/ThemeViewState.ts
@@ -634,6 +634,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
         const rangeFLayer: FilteredLayer = this.layerState.filteredLayers.get("range")
         const rangeIsDisplayed = rangeFLayer?.isDisplayed
         if (
+            rangeFLayer &&
             !QueryParameters.wasInitialized(FilteredLayer.queryParameterKey(rangeFLayer.layerDef))
         ) {
             rangeIsDisplayed?.syncWith(this.featureSwitches.featureSwitchIsTesting, true)