From fb53eb7cb4057a33ae76f09fa1f009334adf1f51 Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Fri, 5 Feb 2021 19:41:39 +0100
Subject: [PATCH] Don't respond to a request twice if an entity has not been
 found.

---
 .changeset/fluffy-hats-hug.md                 | 5 +++++
 plugins/catalog-backend/src/service/router.ts | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/fluffy-hats-hug.md

diff --git a/.changeset/fluffy-hats-hug.md b/.changeset/fluffy-hats-hug.md
new file mode 100644
index 0000000000..b3d06337fd
--- /dev/null
+++ b/.changeset/fluffy-hats-hug.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Don't respond to a request twice if an entity has not been found.
diff --git a/plugins/catalog-backend/src/service/router.ts b/plugins/catalog-backend/src/service/router.ts
index 43c2967233..6064164e31 100644
--- a/plugins/catalog-backend/src/service/router.ts
+++ b/plugins/catalog-backend/src/service/router.ts
@@ -76,8 +76,9 @@ export async function createRouter(
         );
         if (!entities.length) {
           res.status(404).send(`No entity with uid ${uid}`);
+        } else {
+          res.status(200).send(entities[0]);
         }
-        res.status(200).send(entities[0]);
       })
       .delete('/entities/by-uid/:uid', async (req, res) => {
         const { uid } = req.params;
@@ -99,8 +100,9 @@ export async function createRouter(
             .send(
               `No entity with kind ${kind} namespace ${namespace} name ${name}`,
             );
+        } else {
+          res.status(200).send(entities[0]);
         }
-        res.status(200).send(entities[0]);
       });
   }