diff --git a/ems-engine/src/main/java/it/integry/ems/retail/ReportVariazioni/service/VariazioniPVService.java b/ems-engine/src/main/java/it/integry/ems/retail/ReportVariazioni/service/VariazioniPVService.java
index 8da11e67bf..f4ded8c8f0 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/ReportVariazioni/service/VariazioniPVService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/ReportVariazioni/service/VariazioniPVService.java
@@ -123,7 +123,7 @@ public class VariazioniPVService {
             String query = getQueryVariazioni(variazioniPvDTO, setup, codVlis, getSetupSectionDepo.get("SELEZIONA_GRIGLIE"));
             List<HashMap<String, Object>> elencoVar = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), query);
 
-            if (getSetupSectionDepo.get("SELEZIONA_GRIGLIE").equalsIgnoreCase("S")) {
+            if (getSetupSectionDepo.get("SELEZIONA_GRIGLIE") != null && getSetupSectionDepo.get("SELEZIONA_GRIGLIE").equalsIgnoreCase("S")) {
                 grigliaAcquisto = grigliaAcquistoHandlerService.getGrigliaAcquisto();
                 grigliaAcquisto = Stream.of(grigliaAcquisto)
                         .filter(x -> x.getDataValidita().equals(variazioniPvDTO.getDataValidita()) &&
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoHandlerService.java b/ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoHandlerService.java
index 98f4a19ee0..076430f981 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoHandlerService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoHandlerService.java
@@ -170,8 +170,8 @@ public class GrigliaAcquistoHandlerService {
                 setupList = grigliaAcquistoCachedData.get(dbName.toUpperCase());
             }
 
-            if (setupList == null)
-                return getGrigliaAcquisto(multiDBTransactionManager);
+//            if (setupList == null)
+//                return getGrigliaAcquisto(multiDBTransactionManager);
             return setupList;
         }
     }