diff --git a/gravitee-apim-console-webui/src/shared/interceptors/if-match-etag.interceptor.ts b/gravitee-apim-console-webui/src/shared/interceptors/if-match-etag.interceptor.ts
index 3c5d3eb8e61..67cad640f74 100644
--- a/gravitee-apim-console-webui/src/shared/interceptors/if-match-etag.interceptor.ts
+++ b/gravitee-apim-console-webui/src/shared/interceptors/if-match-etag.interceptor.ts
@@ -32,17 +32,23 @@ export class IfMatchEtagInterceptor implements HttpInterceptor {
 
   private urlToKeyMatchers: ((url: string) => string | undefined)[] = [
     (url) => {
-      const matchArray = url.match(new RegExp(`/management/organizations/(.*)/environments/(.*)/apis/(.*)`));
+      const matchArray = url.match(new RegExp(`/management/organizations/([^\\/]+)/environments/([^\\/]+)/apis/([^\\/]+)`));
       if (matchArray) {
         return `api-${matchArray[3]}`;
       }
     },
     (url) => {
-      const matchArray = url.match(new RegExp(`/management/v2/environments/(.*)/apis/(.*)`));
+      const matchArray = url.match(new RegExp(`/management/v2/environments/([^\\/]+)/apis/([^\\/]+)`));
       if (matchArray) {
         return `api-${matchArray[2]}`;
       }
     },
+    (url) => {
+      const matchArray = url.match(new RegExp(`/management/v2/organizations/([^\\/]+)/environments/([^\\/]+)/apis/([^\\/]+)`));
+      if (matchArray) {
+        return `api-${matchArray[3]}`;
+      }
+    },
   ];
   public lastEtag: Record<string, string> = {};