diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.hbs
index 8b6d746b71f9b8..856d3342d47554 100644
--- a/lib/onebox/templates/discourse_topic_onebox.hbs
+++ b/lib/onebox/templates/discourse_topic_onebox.hbs
@@ -1,4 +1,4 @@
-<aside class='quote' data-post="1" data-topic="{{topic_id}}">
+<aside class='quote' data-post="{{post_number}}" data-topic="{{topic_id}}">
   <div class='title'>
     <div class='quote-controls'></div>
     {{{avatar}}}
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 682251ed505b11..935233ead73527 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -202,6 +202,7 @@ def self.local_topic_html(url, route, opts)
       else
         args = {
           topic_id: topic.id,
+          post_number: post.post_number,
           avatar: PrettyText.avatar_img(post.user.avatar_template, "tiny"),
           original_url: url,
           title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)),
diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb
index 1bbc1e76b505df..6ba23c3a95075c 100644
--- a/spec/components/oneboxer_spec.rb
+++ b/spec/components/oneboxer_spec.rb
@@ -54,6 +54,7 @@ def preview(url, user = nil, category = nil, topic = nil)
 
       onebox = preview(public_reply.url, user, public_category)
       expect(onebox).to include(public_reply.excerpt)
+      expect(onebox).to include(%{data-post="2"})
       expect(onebox).to include(PrettyText.avatar_img(replier.avatar_template, "tiny"))
 
       onebox = preview(public_reply.url, user, public_category, public_topic)