diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/src/main/java/org/xwiki/edit/internal/EditorWikiComponent.java b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/src/main/java/org/xwiki/edit/internal/EditorWikiComponent.java
index 3c76d661bbc7b798519f6d236e0fe14b97a4d7c2..9b504400bb90c94a115728be79a9dc9269e31cc5 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/src/main/java/org/xwiki/edit/internal/EditorWikiComponent.java
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/src/main/java/org/xwiki/edit/internal/EditorWikiComponent.java
@@ -142,11 +142,10 @@ protected String render() throws EditException
             XWikiDocument editorDocument = xcontext.getWiki().getDocument(this.getDocumentReference(), xcontext);
             BaseObject editorObject = editorDocument.getXObject(EDITOR_CLASS_REFERENCE);
             String editorCode = editorObject.getStringValue("code");
-            // Make sure the editor code is executed with the rights of the editor document author.
-            xcontext.put(SECURITY_DOCUMENT, editorDocument);
             // Execute the editor code in the context of the current document (because the editor code needs to access
             // the data that has been put on the script context).
-            return xcontext.getDoc().getRenderedContent(editorCode, editorDocument.getSyntax().toIdString(), xcontext);
+            return xcontext.getDoc().getRenderedContent(editorCode, editorDocument.getSyntax().toIdString(), false,
+                editorDocument, xcontext);
         } catch (Exception e) {
             throw new EditException("Failed to render the editor code.", e);
         } finally {