diff --git a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/InlineFilterListener.java b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/InlineFilterListener.java
index 008ec12669..cccd7671d5 100644
--- a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/InlineFilterListener.java
+++ b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/InlineFilterListener.java
@@ -64,4 +64,11 @@ public void endParagraph(Map<String, String> parameters)
     {
         // Disable this event
     }
+
+    @Override
+    public void onMacro(String id, Map<String, String> parameters, String content, boolean inline)
+    {
+        // Force inline to true.
+        super.onMacro(id, parameters, content, true);
+    }
 }
diff --git a/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/InlineFilterListenerTest.java b/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/InlineFilterListenerTest.java
new file mode 100644
index 0000000000..6825ab481c
--- /dev/null
+++ b/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/InlineFilterListenerTest.java
@@ -0,0 +1,79 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.xwiki.rendering.listener;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.xwiki.rendering.block.Block;
+import org.xwiki.rendering.block.MacroBlock;
+import org.xwiki.rendering.block.SpaceBlock;
+import org.xwiki.rendering.block.WordBlock;
+import org.xwiki.rendering.internal.parser.XDOMGeneratorListener;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Unit tests for {@link InlineFilterListener}.
+ *
+ * @version $Id$
+ */
+class InlineFilterListenerTest
+{
+    @Test
+    void beginParagraph()
+    {
+        InlineFilterListener listener = new InlineFilterListener();
+        XDOMGeneratorListener xdomGeneratorListener = new XDOMGeneratorListener();
+        listener.setWrappedListener(xdomGeneratorListener);
+
+        listener.beginDocument(new MetaData());
+        listener.beginParagraph(Listener.EMPTY_PARAMETERS);
+        listener.onWord("This");
+        listener.onSpace();
+        listener.onWord("is");
+        listener.onSpace();
+        listener.onWord("inline");
+        listener.endParagraph(Listener.EMPTY_PARAMETERS);
+        listener.endDocument(new MetaData());
+
+        List<Block> children = xdomGeneratorListener.getXDOM().getChildren();
+        List<Block> expectedChildren = List.of(new WordBlock("This"), new SpaceBlock(), new WordBlock("is"),
+            new SpaceBlock(), new WordBlock("inline"));
+        assertEquals(expectedChildren, children);
+    }
+
+    @Test
+    void onMacro()
+    {
+        InlineFilterListener listener = new InlineFilterListener();
+        XDOMGeneratorListener xdomGeneratorListener = new XDOMGeneratorListener();
+        listener.setWrappedListener(xdomGeneratorListener);
+
+        listener.beginDocument(new MetaData());
+        listener.onMacro("testMacro", Listener.EMPTY_PARAMETERS, null, false);
+        listener.endDocument(new MetaData());
+
+        List<Block> children = xdomGeneratorListener.getXDOM().getChildren();
+        List<Block> expectedChildren = List.of(new MacroBlock("testMacro", Listener.EMPTY_PARAMETERS, null, true));
+        assertEquals(expectedChildren, children);
+    }
+}
diff --git a/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki20/src/test/resources/xwiki20/specific/link/link1.test b/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki20/src/test/resources/xwiki20/specific/link/link1.test
new file mode 100644
index 0000000000..b0c0fb79de
--- /dev/null
+++ b/xwiki-rendering-syntaxes/xwiki-rendering-syntax-xwiki20/src/test/resources/xwiki20/specific/link/link1.test
@@ -0,0 +1,21 @@
+.#-------------------------------------------------------------------------------------------------------
+.input|xwiki/2.0
+.# Test a standalone macro nested inside a link
+.#-------------------------------------------------------------------------------------------------------
+[[
+
+{{info}}Type your information message here.{{/info}}>>https://www.xwiki.org/xwiki/bin/view/Main/]]
+.#-----------------------------------------------------
+.expect|event/1.0
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+beginLink [Typed = [false] Type = [url] Reference = [https://www.xwiki.org/xwiki/bin/view/Main/]] [false]
+onMacroInline [info] [] [Type your information message here.]
+endLink [Typed = [false] Type = [url] Reference = [https://www.xwiki.org/xwiki/bin/view/Main/]] [false]
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xwiki/2.0
+.#-----------------------------------------------------
+[[{{info}}Type your information message here.{{/info}}>>https://www.xwiki.org/xwiki/bin/view/Main/]]