diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 4fc291653..60c1eb4f7 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-selfcare-ms-backoffice
 description: Microservice that manage api keys for pagopa product from selfcare
 type: application
-version: 0.411.0
-appVersion: "2.26.4"
+version: 0.412.0
+appVersion: "2.26.3-3-next"
 dependencies:
   - name: microservice-chart
     version: 2.4.0
diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
index 5e4ca99c6..c915e6ecc 100644
--- a/helm/values-dev.yaml
+++ b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-selfcare-ms-backoffice-backend
-    tag: "2.26.4"
+    tag: "2.26.3-3-next"
     pullPolicy: Always
   livenessProbe:
     httpGet:
diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
index 15dd53aaf..25594cda7 100644
--- a/helm/values-prod.yaml
+++ b/helm/values-prod.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-selfcare-ms-backoffice-backend
-    tag: "2.26.4" #improve
+    tag: "2.26.3-3-next" #improve
     pullPolicy: Always
   livenessProbe:
     httpGet:
diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
index 889ed0027..a445addae 100644
--- a/helm/values-uat.yaml
+++ b/helm/values-uat.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-selfcare-ms-backoffice-backend
-    tag: "2.26.4" #improve
+    tag: "2.26.3-3-next" #improve
     pullPolicy: Always
   livenessProbe:
     httpGet:
diff --git a/openapi/openapi.json b/openapi/openapi.json
index 0968bc185..5f8c3eeb3 100644
--- a/openapi/openapi.json
+++ b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "description": "Microservice to manage PagoPA Backoffice",
     "termsOfService": "https://www.pagopa.gov.it/",
     "title": "SelfCare Backoffice",
-    "version": "2.26.4"
+    "version": "2.26.3-3-next"
   },
   "servers": [
     {
diff --git a/pom.xml b/pom.xml
index e3cf9ceaf..a68724712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
         <version>2.5.14</version>
     </parent>
     <artifactId>pagopa-selfcare-ms-backoffice</artifactId>
-    <version>2.26.4</version>
+    <version>2.26.3-3-next</version>
     <name>SelfCare Backoffice</name>
     <description>Microservice to manage PagoPA Backoffice</description>
 
diff --git a/src/main/java/it/pagopa/selfcare/pagopa/backoffice/service/TaxonomyService.java b/src/main/java/it/pagopa/selfcare/pagopa/backoffice/service/TaxonomyService.java
index 191a3b70e..edbea3bfb 100644
--- a/src/main/java/it/pagopa/selfcare/pagopa/backoffice/service/TaxonomyService.java
+++ b/src/main/java/it/pagopa/selfcare/pagopa/backoffice/service/TaxonomyService.java
@@ -12,6 +12,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -44,8 +45,12 @@ public Taxonomies getTaxonomies(String code, String ec, String macroArea, Boolea
     public List<Taxonomy> getTaxonomiesByCodes(List<String> codes) {
         return taxonomyRepository.findBySpecificBuiltInDataIn(
                 codes != null ?
-                        codes.stream().map(code -> Pattern.compile(code.contains("/") ?
-                                        "^"+code+"$" : "^[0-9]/"+code+"/$"))
+                        codes.stream().filter(Objects::nonNull).map(code -> {
+                            if (code.contains("/")) {
+                                return Pattern.compile( "^"+code+"$");
+                            }
+                            return Pattern.compile("^[0-9]/"+code+"/$");
+                         })
                         .toList() : new ArrayList<>()).stream()
                 .map(elem -> {
                     Taxonomy taxonomy = modelMapper.map(elem, Taxonomy.class);