diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index fbadd39f..30983e90 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -16,21 +16,29 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }})
+    name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }}) / blacklight ${{matrix.blacklight_version}}
     strategy:
       matrix:
         ruby: [2.7, '3.0']
         rails_version: ['6.1.5', '7.0.2.3']
+        blacklight_version: ['7.29.0']
         additional_engine_cart_rails_options: ['']
         include:
         - ruby: '2.7'
           rails_version: '5.2.4.2'
+          blacklight_version: '6.25.0'
+        - ruby: '2.7'
+          rails_version: '5.2.4.2'
+          blacklight_version: '7.29.0'
         - ruby: '3.1'
           rails_version: '7.0.2.3'
+          blacklight_version: '7.29.0'
         - ruby: '3.0'
           rails_version: '7.0.2.3'
+          blacklight_version: '7.29.0'
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
+      BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
       ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.engine_cart_rails_options }}"
     steps:
     - uses: actions/checkout@v3
diff --git a/Gemfile b/Gemfile
index 0aa79a50..a630decc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,5 +30,9 @@ else
   when /^5.[12]/, /^6.0/
     gem 'sass-rails', '~> 5.0'
   end
+
+  if ENV['BLACKLIGHT_VERSION']
+    gem 'blacklight', ENV['BLACKLIGHT_VERSION']
+  end
 end
 # END ENGINE_CART BLOCK
diff --git a/lib/blacklight_range_limit/controller_override.rb b/lib/blacklight_range_limit/controller_override.rb
index 7d6834f2..de2fed3f 100644
--- a/lib/blacklight_range_limit/controller_override.rb
+++ b/lib/blacklight_range_limit/controller_override.rb
@@ -22,8 +22,14 @@ def range_limit
       # field (with start/end params) mentioned in query params
       # range_field, range_start, and range_end
 
-      @response, _ = search_service.search_results do |search_builder|
-        search_builder.except(:add_range_limit_params).append(:fetch_specific_range_limit)
+      if Gem.loaded_specs['blacklight'].version.to_s.start_with?('6.')
+        @response, _ = search_results(params) do |search_builder|
+          search_builder.except(:add_range_limit_params).append(:fetch_specific_range_limit)
+        end
+      else
+        @response, _ = search_service.search_results do |search_builder|
+          search_builder.except(:add_range_limit_params).append(:fetch_specific_range_limit)
+        end
       end
       render('blacklight_range_limit/range_segments', :locals => {:solr_field => params[:range_field]}, :layout => !request.xhr?)
     end