diff --git a/packages/reactivecore b/packages/reactivecore
index 6a8616e9eb..4ffdeb0a76 160000
--- a/packages/reactivecore
+++ b/packages/reactivecore
@@ -1 +1 @@
-Subproject commit 6a8616e9ebfe12b0aac56eca62b6de9e89c3ef6f
+Subproject commit 4ffdeb0a766e25db46f5ff5c9eaeafc2439934aa
diff --git a/packages/web/src/components/range/DynamicRangeSlider.js b/packages/web/src/components/range/DynamicRangeSlider.js
index 0c7dd9fbe0..a07e04499a 100644
--- a/packages/web/src/components/range/DynamicRangeSlider.js
+++ b/packages/web/src/components/range/DynamicRangeSlider.js
@@ -226,9 +226,14 @@ class DynamicRangeSlider extends Component {
 			this.setReact(this.props);
 		});
 
-		checkSomePropChange(this.props, prevProps, ['dataField', 'nestedField', 'aggregationSize'], () => {
-			this.updateRangeQueryOptions(this.props);
-		});
+		checkSomePropChange(
+			this.props,
+			prevProps,
+			['dataField', 'nestedField', 'aggregationSize'],
+			() => {
+				this.updateRangeQueryOptions(this.props);
+			},
+		);
 
 		checkSomePropChange(
 			this.props,
@@ -629,7 +634,12 @@ class DynamicRangeSlider extends Component {
 	}
 
 	render() {
-		if (!this.state.currentValue || !this.state.range || this.props.range.start === null) {
+		if (
+			!this.state.currentValue
+			|| !this.state.range
+			|| this.props.range === null
+			|| this.props.range.start === null
+		) {
 			return null;
 		}
 
@@ -785,6 +795,10 @@ const mapStateToProps = (state, props) => {
 	}
 	if (range) {
 		range = formatRange(range);
+		// eslint-disable-next-line no-restricted-globals
+		if (isNaN(range.start) && isNaN(range.end)) {
+			range = null;
+		}
 	}
 	return {
 		options,