diff --git a/lib/gitlab/github_import/importer/diff_note_importer.rb b/lib/gitlab/github_import/importer/diff_note_importer.rb
index 9bda066efcc8a030915e22b52293aef60103e0ba..823d5cf0e81742c3f10cbeab16a6eae0cf953678 100644
--- a/lib/gitlab/github_import/importer/diff_note_importer.rb
+++ b/lib/gitlab/github_import/importer/diff_note_importer.rb
@@ -24,6 +24,7 @@ def execute
           note_body = MarkdownText.format(note.note, note.author, author_found)
 
           attributes = {
+            discussion_id: Discussion.discussion_id(note),
             noteable_type: 'MergeRequest',
             noteable_id: mr_id,
             project_id: project.id,
diff --git a/lib/gitlab/github_import/representation/diff_note.rb b/lib/gitlab/github_import/representation/diff_note.rb
index d336b1ba79740fbfcce59134a5390092c767b409..1392fddcaccaaae1020fe2e84a58b92d78049c75 100644
--- a/lib/gitlab/github_import/representation/diff_note.rb
+++ b/lib/gitlab/github_import/representation/diff_note.rb
@@ -33,7 +33,7 @@ def self.from_api_response(note)
             noteable_type: 'MergeRequest',
             noteable_id: matches[:iid].to_i,
             file_path: note.path,
-            commit_id: note.commit_id,
+            commit_id: note.original_commit_id,
             diff_hunk: note.diff_hunk,
             author: user,
             note: note.body,