diff --git a/core/base-service/legacy-request-handler.js b/core/base-service/legacy-request-handler.js
index d7375a880f7608b306205af369db5c7016ffff2b..91e2d394d774f805495c195534194ea48a735f61 100644
--- a/core/base-service/legacy-request-handler.js
+++ b/core/base-service/legacy-request-handler.js
@@ -185,12 +185,7 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
         {}
       )
       const svg = makeBadge(badgeData)
-      let extension
-      try {
-        extension = match[0].split('.').pop()
-      } catch (e) {
-        extension = 'svg'
-      }
+      const extension = (match.slice(-1)[0] || '.svg').replace(/^\./, '')
       setCacheHeadersOnResponse(ask.res)
       makeSend(extension, ask.res, end)(svg)
     }, 25000)