diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 873f05df6e..c5a9f5cab3 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -427,6 +427,9 @@ define('forum/topic', [
 		if (config.enableQuickReply || (config.theme && config.theme.enableQuickReply)) {
 			quickreply.init({
 				route: `/topics/${ajaxify.data.tid}`,
+				body: {
+					tid: ajaxify.data.tid,
+				},
 			});
 		}
 	}
diff --git a/public/src/modules/quickreply.js b/public/src/modules/quickreply.js
index f33f73fa91..bb06d822e2 100644
--- a/public/src/modules/quickreply.js
+++ b/public/src/modules/quickreply.js
@@ -124,9 +124,9 @@ define('quickreply', [
 			storage.removeItem(qrDraftId);
 			const textEl = components.get('topic/quickreply/text');
 			hooks.fire('action:composer.post.new', {
-				tid: ajaxify.data.tid,
-				title: ajaxify.data.titleRaw,
+				title: ajaxify.data.tid ? ajaxify.data.titleRaw : '',
 				body: textEl.val(),
+				...opts.body,
 			});
 			textEl.val('');
 		});