diff --git a/core/lib/workarea.rb b/core/lib/workarea.rb
index 4413443fc..b9f8bc26e 100644
--- a/core/lib/workarea.rb
+++ b/core/lib/workarea.rb
@@ -180,7 +180,13 @@ def self.define_content_block_types(&block)
   # @return [ActiveSupport::Deprecation]
   #
   def self.deprecation
-    @deprecation ||= ActiveSupport::Deprecation.new('3.6', 'Workarea')
+    @deprecation ||= begin
+      deprecator = ActiveSupport::Deprecation.new('3.6', 'Workarea')
+      if Rails.application.respond_to?(:deprecators)
+        Rails.application.deprecators[:workarea] ||= deprecator
+      end
+      deprecator
+    end
   end
 
   # Whether the app should skip connecting to external services on boot,