diff --git a/lib/code0/zero_track/logs/json_formatter.rb b/lib/code0/zero_track/logs/json_formatter.rb
index 54234f7..55ecb8e 100644
--- a/lib/code0/zero_track/logs/json_formatter.rb
+++ b/lib/code0/zero_track/logs/json_formatter.rb
@@ -29,11 +29,27 @@ def chomp(message)
           message.strip
         end
 
+        class NoOpTagStack
+          include Singleton
+
+          def push_tags(*)
+            []
+          end
+
+          def pop_tags(*); end
+
+          def clear; end
+
+          def format_message(message)
+            message
+          end
+        end
+
         class Tagged < JsonFormatter
           include ActiveSupport::TaggedLogging::Formatter
 
-          def tagged(*_args)
-            yield self # Ignore tags, they break the json layout as they are prepended to the log line
+          def tag_stack
+            NoOpTagStack.instance
           end
         end
       end