diff --git a/mod/assign/feedback/comments/classes/privacy/provider.php b/mod/assign/feedback/comments/classes/privacy/provider.php
index e6453e6591b..aa014a05cc3 100644
--- a/mod/assign/feedback/comments/classes/privacy/provider.php
+++ b/mod/assign/feedback/comments/classes/privacy/provider.php
@@ -107,18 +107,18 @@ class provider implements
         $gradeid = $exportdata->get_pluginobject()->id;
         $comments = $plugin->get_feedback_comments($gradeid);
         if ($comments && !empty($comments->commenttext)) {
+            $currentpath = array_merge(
+                $exportdata->get_subcontext(),
+                [get_string('privacy:commentpath', 'assignfeedback_comments')]
+            );
+
             $comments->commenttext = writer::with_context($assign->get_context())->rewrite_pluginfile_urls(
-                [],
+                $currentpath,
                 ASSIGNFEEDBACK_COMMENTS_COMPONENT,
                 ASSIGNFEEDBACK_COMMENTS_FILEAREA,
                 $gradeid,
                 $comments->commenttext
             );
-
-            $currentpath = array_merge(
-                $exportdata->get_subcontext(),
-                [get_string('privacy:commentpath', 'assignfeedback_comments')]
-            );
             $data = (object)
             [
                 'commenttext' => format_text($comments->commenttext, $comments->commentformat,