diff --git a/comment/comment.js b/comment/comment.js
index 8d13582be4304..cce6192bbd04d 100644
--- a/comment/comment.js
+++ b/comment/comment.js
@@ -37,6 +37,7 @@ M.core_comment = {
                 this.client_id = args.client_id;
                 this.itemid = args.itemid;
                 this.commentarea = args.commentarea;
+                this.component = args.component;
                 this.courseid = args.courseid;
                 this.contextid = args.contextid;
                 this.env = args.env;
@@ -121,6 +122,7 @@ bodyContent: '<div class="comment-delete-confirm"><a href="#" id="confirmdelete-
                 params['area']      = this.commentarea;
                 params['courseid']  = this.courseid;
                 params['contextid'] = this.contextid;
+                params['component'] = this.component;
                 if (args['params']) {
                     for (i in args['params']) {
                         params[i] = args['params'][i];
diff --git a/comment/comment_ajax.php b/comment/comment_ajax.php
index 022676f0cdc9f..6187af8ae7786 100644
--- a/comment/comment_ajax.php
+++ b/comment/comment_ajax.php
@@ -45,6 +45,7 @@
 $content   = optional_param('content',   '', PARAM_RAW);
 $itemid    = optional_param('itemid',    '', PARAM_INT);
 $page      = optional_param('page',      0,  PARAM_INT);
+$component = optional_param('component', '',  PARAM_ALPHAEXT);
 
 echo $OUTPUT->header(); // send headers
 
@@ -57,6 +58,7 @@
     $args->area      = $area;
     $args->itemid    = $itemid;
     $args->client_id = $client_id;
+    $args->component = $component;
     $manager = new comment($args);
 } else {
     die;
diff --git a/comment/lib.php b/comment/lib.php
index 58bf4eae24452..d0d3059b34ae2 100644
--- a/comment/lib.php
+++ b/comment/lib.php
@@ -221,6 +221,7 @@ public static function init() {
     }
 
     public function set_component($component) {
+        $this->component = $component;
         list($this->plugintype, $this->pluginname) = normalize_component($component);
         return null;
     }
@@ -277,6 +278,7 @@ public function output($return = true) {
         $options->courseid = $this->courseid;
         $options->contextid = $this->contextid;
         $options->env = $this->env;
+        $options->component = $this->component;
         if ($this->env == 'block_comments') {
             $options->notoggle = true;
             $options->autostart = true;