diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
index 1d8a186..f16308a 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
@@ -505,7 +505,11 @@ public class IndicatorController {
             if (indicatorPath.getParameters().containsKey("index_name")) {
                 indicatorPath.getParameters().put("index_name", stakeholder.getIndex_name());
             } else if (indicatorPath.getParameters().containsKey("index_shortName")) {
-                indicatorPath.getParameters().put("index_shortName", stakeholder.getIndex_name().toLowerCase());
+                if(stakeholder.getIndex_shortName() != null) {
+                    indicatorPath.getParameters().put("index_shortName",  stakeholder.getIndex_shortName().toLowerCase());
+                } else {
+                    indicatorPath.getParameters().remove("index_shortName");
+                }
             } else if (indicatorPath.getParameters().containsKey("index_id")) {
                 indicatorPath.getParameters().put("index_id", stakeholder.getIndex_id());
             }