diff --git a/classes/Notice.php b/classes/Notice.php
index 461e8f9aab..c6ae3c9155 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -507,7 +507,8 @@ class Notice extends Managed_DataObject
                 throw new ClientException(_('You already repeated that notice.'));
             }
 
-            $notice->repeat_of = $repeat_of;
+            $notice->repeat_of = $repeat->id;
+            $notice->conversation = $repeat->conversation;
         } else {
             $reply = null;