diff --git a/src/main/java/com/olympus/hermione/controllers/ScenarioController.java b/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
index 7c029ea..1298f4c 100644
--- a/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
+++ b/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
@@ -1,5 +1,7 @@
 package com.olympus.hermione.controllers;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -92,6 +94,11 @@ public class ScenarioController {
     public ScenarioExecution getScenarioExecution(@PathVariable String id) {
         return scenarioExecutionRepository.findById(id).get();
     }
+
+    @GetMapping("/scenariosByUser")
+    public List<ScenarioExecution> getScenarioByUser() {
+        return scenarioExecutionService.getListExecutionScenarioByUser();
+    }
    
 
 
diff --git a/src/main/java/com/olympus/hermione/repository/ScenarioExecutionRepository.java b/src/main/java/com/olympus/hermione/repository/ScenarioExecutionRepository.java
index 3b8e981..eba7484 100644
--- a/src/main/java/com/olympus/hermione/repository/ScenarioExecutionRepository.java
+++ b/src/main/java/com/olympus/hermione/repository/ScenarioExecutionRepository.java
@@ -1,13 +1,18 @@
 package com.olympus.hermione.repository;
 
+import java.util.List;
+
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import com.olympus.hermione.models.Scenario;
 import com.olympus.hermione.models.ScenarioExecution;
 
 @Repository
 public interface ScenarioExecutionRepository extends CrudRepository<ScenarioExecution, String> {
     
+    List<ScenarioExecution> findByExecutedByUserId(String userId);
+
 }
 
 
diff --git a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
index 0183592..ff5f1d0 100644
--- a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
+++ b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
@@ -247,8 +247,9 @@ public class ScenarioExecutionService {
                                 
                     User principal = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
                     scenarioExecution.setExecutedByUserId(principal.getId());
-
-                    scenarioExecutionInput.getInputs().put("selected_application", principal.getSelectedApplication().getInternal_name());
+                    if(principal.getSelectedApplication()!=null){
+                        scenarioExecutionInput.getInputs().put("selected_application", principal.getSelectedApplication().getInternal_name());
+                    }
                     scenarioExecutionInput.getInputs().put("selected_project", principal.getSelectedProject().getInternal_name());
                 }
 
@@ -302,4 +303,17 @@ public class ScenarioExecutionService {
         }
     }
 
+    public List<ScenarioExecution> getListExecutionScenarioByUser(){
+        logger.info("getListProjectByUser function:");
+
+        List<ScenarioExecution> lstScenarioExecution = null;
+
+        User principal = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+       
+        lstScenarioExecution = scenarioExecutionRepository.findByExecutedByUserId(principal.getId());
+
+        return lstScenarioExecution;
+
+    }
+
 }