diff --git a/lib/pleroma/web/api_spec/schemas/status.ex b/lib/pleroma/web/api_spec/schemas/status.ex
index 5d0eedb08..07f03134a 100644
--- a/lib/pleroma/web/api_spec/schemas/status.ex
+++ b/lib/pleroma/web/api_spec/schemas/status.ex
@@ -198,6 +198,11 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do
             nullable: true,
             description: "Quoted status (if any)"
           },
+          quote_id: %Schema{
+            nullable: true,
+            allOf: [FlakeID],
+            description: "ID of the status being quoted, if any"
+          },
           quote_url: %Schema{
             type: :string,
             format: :uri,
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index ba4a8f3eb..3d3039751 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -312,6 +312,8 @@ def render("show.json", %{activity: %{data: %{"object" => _object}} = activity}
     # Here the implicit index of the current content is 0
     chrono_order = history_len - 1
 
+    quote_id = get_quote_id(activity)
+
     quote_activity = get_quote(activity, opts)
 
     quote_post =
@@ -431,6 +433,7 @@ def render("show.json", %{activity: %{data: %{"object" => _object}} = activity}
         context: object.data["context"],
         in_reply_to_account_acct: reply_to_user && reply_to_user.nickname,
         quote: quote_post,
+        quote_id: quote_id,
         quote_url: object.data["quoteUrl"],
         quote_visible: visible_for_user?(quote_activity, opts[:for]),
         content: %{"text/plain" => content_plaintext},
@@ -689,6 +692,13 @@ def get_quote(%{data: %{"object" => _object}} = activity, _) do
     end
   end
 
+  defp get_quote_id(activity) do
+    case get_quote(activity, %{}) do
+      %Activity{id: id} -> id
+      _ -> nil
+    end
+  end
+
   def render_content(%{data: %{"name" => name}} = object) when not is_nil(name) and name != "" do
     url = object.data["url"] || object.data["id"]
 
diff --git a/test/pleroma/web/mastodon_api/views/status_view_test.exs b/test/pleroma/web/mastodon_api/views/status_view_test.exs
index 6d3a72970..221244d4e 100644
--- a/test/pleroma/web/mastodon_api/views/status_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/status_view_test.exs
@@ -327,6 +327,7 @@ test "a note activity" do
         context: object_data["context"],
         in_reply_to_account_acct: nil,
         quote: nil,
+        quote_id: nil,
         quote_url: nil,
         quote_visible: false,
         content: %{"text/plain" => HTML.strip_tags(object_data["content"])},
@@ -435,10 +436,12 @@ test "a quote post" do
     status = StatusView.render("show.json", %{activity: quoted_quote_post})
 
     assert status.pleroma.quote.id == to_string(quote_post.id)
+    assert status.pleroma.quote_id == to_string(quote_post.id)
     assert status.pleroma.quote_url == Object.normalize(quote_post).data["id"]
 
     # Quotes don't go more than one level deep
     refute status.pleroma.quote.pleroma.quote
+    assert status.pleroma.quote.pleroma.quote_id == to_string(post.id)
     assert status.pleroma.quote.pleroma.quote_url == Object.normalize(post).data["id"]
 
     # In an index