diff --git a/.changeset/nine-mails-crash.md b/.changeset/nine-mails-crash.md
new file mode 100644
index 0000000000..3dc4334f17
--- /dev/null
+++ b/.changeset/nine-mails-crash.md
@@ -0,0 +1,9 @@
+---
+'@backstage/backend-common': patch
+---
+
+The `ZipArchiveResponse` now correctly handles corrupt ZIP archives.
+
+Before this change, certain corrupt ZIP archives either cause the inflater to throw (as expected), or will hang the parser indefinitely.
+
+This change introduces a default timeout of 3000ms before throwing an error message when trying to unzip an archive.