diff --git a/sunspot_rails/lib/sunspot/rails/server.rb b/sunspot_rails/lib/sunspot/rails/server.rb
index 21db34cb8..b612fc7f9 100644
--- a/sunspot_rails/lib/sunspot/rails/server.rb
+++ b/sunspot_rails/lib/sunspot/rails/server.rb
@@ -59,7 +59,7 @@ def pid_file
       # String:: data_path
       #
       def solr_data_dir
-        File.join(solr_home, 'data', ::Rails.env)
+        configuration.data_path
       end
 
       #