diff --git a/relay-server/src/endpoints/minidump.rs b/relay-server/src/endpoints/minidump.rs
index fd5de0cc1a7..d59997d47a5 100644
--- a/relay-server/src/endpoints/minidump.rs
+++ b/relay-server/src/endpoints/minidump.rs
@@ -651,18 +651,6 @@ async fn items(
     Ok(items)
 }
 
-fn envelope(
-    items: Managed<Items>,
-    meta: RequestMeta,
-    managed_err: Managed<(DataCategory, usize)>,
-) -> Result<Managed<Box<Envelope>>, BadStoreRequest> {
-    Ok(Managed::zip(managed_err, items).try_map(|(_, items), _| {
-        let event_id = common::event_id_from_items(&items)?.unwrap_or_default();
-        let envelope = Envelope::from_request(Some(event_id), meta).with_items(items);
-        Ok::<_, BadStoreRequest>(Box::new(envelope))
-    })?)
-}
-
 async fn handle(
     state: ServiceState,
     meta: RequestMeta,
@@ -701,7 +689,11 @@ async fn handle(
         .await
         .reject(&managed_err)?;
 
-    let mut envelope = envelope(items, meta, managed_err)?;
+    let mut envelope = Managed::zip(managed_err, items).try_map(|(_, items), _| {
+        let event_id = common::event_id_from_items(&items)?.unwrap_or_default();
+        let envelope = Envelope::from_request(Some(event_id), meta).with_items(items);
+        Ok::<_, BadStoreRequest>(Box::new(envelope))
+    })?;
     if gpu_crash_split {
         let (cpu, gpu) = utils::gpu::split_crash(envelope);
         if let Some(gpu) = gpu {
diff --git a/relay-server/src/endpoints/playstation.rs b/relay-server/src/endpoints/playstation.rs
index 0e4d46945c4..363de6b3782 100644
--- a/relay-server/src/endpoints/playstation.rs
+++ b/relay-server/src/endpoints/playstation.rs
@@ -220,20 +220,6 @@ async fn multipart_to_items(
     Ok(items)
 }
 
-fn envelope(
-    items: Managed<Items>,
-    meta: RequestMeta,
-    managed_err: Managed<(DataCategory, usize)>,
-) -> Result<Managed<Box<Envelope>>, BadStoreRequest> {
-    Ok(Managed::zip(managed_err, items).try_map(|(_, items), _| {
-        let event_id = common::event_id_from_items(&items)?.unwrap_or_default();
-        let envelope = Envelope::from_request(Some(event_id), meta)
-            .with_items(items)
-            .with_required_feature(Feature::PlaystationIngestion);
-        Ok::<_, BadStoreRequest>(Box::new(envelope))
-    })?)
-}
-
 async fn handle(
     state: ServiceState,
     meta: RequestMeta,
@@ -255,7 +241,13 @@ async fn handle(
     let items = multipart_to_items(multipart, &meta, &state, upload_context)
         .await
         .reject(&managed_err)?;
-    let envelope = envelope(items, meta, managed_err)?;
+    let envelope = Managed::zip(managed_err, items).try_map(|(_, items), _| {
+        let event_id = common::event_id_from_items(&items)?.unwrap_or_default();
+        let envelope = Envelope::from_request(Some(event_id), meta)
+            .with_items(items)
+            .with_required_feature(Feature::PlaystationIngestion);
+        Ok::<_, BadStoreRequest>(Box::new(envelope))
+    })?;
 
     let id = envelope.event_id();