diff --git a/src/api/routes/tps.js b/src/api/routes/tps.js
index 54621ce..c317d79 100644
--- a/src/api/routes/tps.js
+++ b/src/api/routes/tps.js
@@ -20,6 +20,16 @@ router.get("/", async (req, res, next) => {
   const propertyName = req.query.propertyName;
   const { host, tenant, token } = auth;
   logger.debug(`tps GET ${propertyName} from ${host}`);
+
+  if (!propertyName || propertyName.length == 0) {
+    next(
+      new createHttpError.NotFound(
+        `Blank property keys not allowed`
+      )
+    );
+    return;
+  }
+
   axios
     .get(
       `${host}/tenant-properties-service/${tenant}/properties?q=${propertyName}`,