1 files changed, 8 insertions, 4 deletions

diff --git a/app/services/issues/clone_service.rb b/app/services/issues/clone_service.rb
index 896b15a14b8..07dd9a98f89 100644
--- a/app/services/issues/clone_service.rb
+++ b/app/services/issues/clone_service.rb
@@ -41,7 +41,6 @@ module Issues
     def update_new_entity
       # we don't call `super` because we want to be able to decide whether or not to copy all comments over.
       update_new_entity_description
-      copy_award_emoji
 
       if with_notes
         copy_notes
@@ -96,9 +95,14 @@ module Issues
     end
 
     def add_note_from
-      SystemNoteService.noteable_cloned(new_entity, target_project,
-        original_entity, current_user,
-        direction: :from)
+      SystemNoteService.noteable_cloned(
+        new_entity,
+        target_project,
+        original_entity,
+        current_user,
+        direction: :from,
+        created_at: new_entity.created_at
+      )
     end
 
     def add_note_to