diff --git a/lib/react/rails/railtie.rb b/lib/react/rails/railtie.rb
index 47ffcfed6..874463b18 100644
--- a/lib/react/rails/railtie.rb
+++ b/lib/react/rails/railtie.rb
@@ -51,7 +51,7 @@ class Railtie < ::Rails::Railtie
 
       end
 
-      config.before_initialize do |app|
+      initializer "react_rails.set_variant", after: :engines_blank_point, group: :all do |app|
         asset_variant = React::Rails::AssetVariant.new({
           variant: app.config.react.variant,
           addons: app.config.react.addons,
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index af83c9f3e..294d0d309 100644
--- a/test/dummy/config/application.rb
+++ b/test/dummy/config/application.rb
@@ -26,6 +26,7 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.react.variant = :production
+    config.react.addons = false
 
     config.assets.enabled = true
   end
diff --git a/test/dummy/config/initializers/react.rb b/test/dummy/config/initializers/react.rb
new file mode 100644
index 000000000..de3c95994
--- /dev/null
+++ b/test/dummy/config/initializers/react.rb
@@ -0,0 +1,2 @@
+# Override setting set in application.rb
+Rails.application.config.react.addons = true
diff --git a/test/react_test.rb b/test/react_test.rb
index 57f3a7ae0..4f62b9198 100644
--- a/test/react_test.rb
+++ b/test/react_test.rb
@@ -35,8 +35,8 @@ class ReactTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "the development version is loaded" do
+  test "the development version with addons is loaded" do
     asset = Rails.application.assets.find_asset('react')
-    assert asset.pathname.to_s.end_with?('development/react.js')
+    assert asset.pathname.to_s.end_with?('development-with-addons/react.js')
   end
 end