diff --git a/api/src/security/api-keys.js b/api/src/security/api-keys.js
index 754da2af..eee48da3 100644
--- a/api/src/security/api-keys.js
+++ b/api/src/security/api-keys.js
@@ -89,6 +89,10 @@ const formatKeys = (keyData) => {
         formatted[key] = {};
 
         if (data.limit) {
+            if (data.limit === "unlimited") {
+                data.limit = Infinity;
+            }
+
             formatted[key].limit = data.limit;
         }