diff --git a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
index adab07c..e70141c 100644
--- a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
+++ b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
@@ -578,8 +578,10 @@ public class ScenarioExecutionService {
         User principal = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         criteriaList.add(Criteria.where("execSharedMap.user_input.selected_project")
                 .is(principal.getSelectedProject().getInternal_name()));
-        criteriaList.add(Criteria.where("execSharedMap.user_input.selected_application")
-                .is(principal.getSelectedApplication().getInternal_name()));
+        if (principal.getSelectedApplication() != null) {
+            criteriaList.add(Criteria.where("execSharedMap.user_input.selected_application")
+                    .is(principal.getSelectedApplication().getInternal_name()));
+        }
         // here: 
         // filtri
         // here: