diff --git a/lib/redmine_markdown_extra_formatter/wiki_formatter.rb b/lib/redmine_markdown_extra_formatter/wiki_formatter.rb
index 6d181f7..7d58023 100644
--- a/lib/redmine_markdown_extra_formatter/wiki_formatter.rb
+++ b/lib/redmine_markdown_extra_formatter/wiki_formatter.rb
@@ -100,7 +100,9 @@ def initialize(text)
     def to_html(&block)
       @macros_runner = block
       parsedText = BlueFeather.parse(@text)
-      parsedText = inline_macros(parsedText)
+      unless Redmine::WikiFormatting::respond_to?(:execute_macros)
+        parsedText = inline_macros(parsedText)
+      end
       parsedText = syntax_highlight(parsedText)
     rescue => e
       return("<pre>problem parsing wiki text: #{e.message}\n"+