diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb
index 6a0320835bd..b28350cf1b0 100644
--- a/app/models/spree/gateway.rb
+++ b/app/models/spree/gateway.rb
@@ -5,6 +5,7 @@
 
 module Spree
   class Gateway < PaymentMethod
+    acts_as_taggable
     include PaymentMethodDistributors
 
     delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit
diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 321d7a93513..f17d1d83a7f 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -8,15 +8,6 @@
 
 require 'spree/core'
 
-# Due to a bug in ActiveRecord we need to load the tagging code in Gateway which
-# should have inherited it from its parent PaymentMethod.
-# We have to call it before loading the PaymentMethod decorator because the
-# tagging code won't load twice within the inheritance chain.
-# https://github.com/openfoodfoundation/openfoodnetwork/issues/3121
-Spree::Gateway.class_eval do
-  acts_as_taggable
-end
-
 Spree.config do |config|
   config.site_url = ENV['SITE_URL'] if ENV['SITE_URL']
   config.site_name = ENV['SITE_NAME'] if ENV['SITE_NAME']