diff --git a/src/Resources/views/storefront/component/listing/filter-panel.html.twig b/src/Resources/views/storefront/component/listing/filter-panel.html.twig
index a4fab098..7bc1b6f3 100644
--- a/src/Resources/views/storefront/component/listing/filter-panel.html.twig
+++ b/src/Resources/views/storefront/component/listing/filter-panel.html.twig
@@ -25,7 +25,7 @@
                 {% endif %}
 
                 {% if filter is instanceof("\\Nosto\\NostoIntegration\\Search\\Response\\GraphQL\\Filter\\RangeSliderFilter") %}
-                    {% sw_include '@NostoIntegration/storefront/component/listing/filter/filter-range-slider.html.twig' with {
+                    {% sw_include '@Storefront/storefront/component/listing/filter/filter-range.html.twig' with {
                         sidebar: sidebar,
                         name: filter.id,
                         minKey: filter.minKey,
diff --git a/src/Resources/views/storefront/component/listing/filter/filter-range-slider.html.twig b/src/Resources/views/storefront/component/listing/filter/filter-range.html.twig
similarity index 84%
rename from src/Resources/views/storefront/component/listing/filter/filter-range-slider.html.twig
rename to src/Resources/views/storefront/component/listing/filter/filter-range.html.twig
index 8a550a0c..dcdd3e18 100644
--- a/src/Resources/views/storefront/component/listing/filter/filter-range-slider.html.twig
+++ b/src/Resources/views/storefront/component/listing/filter/filter-range.html.twig
@@ -25,5 +25,7 @@
 {% block component_filter_range_container %}
     {{ parent() }}
 
-    <div class="nosto--range-slider"></div>
+    {% if context.context.extensions.nostoService.enabled %}
+        <div class="nosto--range-slider"></div>
+    {% endif %}
 {% endblock %}