diff --git a/activiti-core/activiti-spring-boot-starter/src/main/java/org/activiti/spring/ProcessDeployedEventProducer.java b/activiti-core/activiti-spring-boot-starter/src/main/java/org/activiti/spring/ProcessDeployedEventProducer.java
index fa8e5f3a89dc17dd985e09c51c8012b21dc00e57..decc5e3a66f2631ec1dbac62b8cc787fc62d3bae 100644
--- a/activiti-core/activiti-spring-boot-starter/src/main/java/org/activiti/spring/ProcessDeployedEventProducer.java
+++ b/activiti-core/activiti-spring-boot-starter/src/main/java/org/activiti/spring/ProcessDeployedEventProducer.java
@@ -51,7 +51,7 @@ public class ProcessDeployedEventProducer extends AbstractActivitiSmartLifeCycle
 
     @Override
     public void doStart() {
-        List<ProcessDefinition> processDefinitions = converter.from(repositoryService.createProcessDefinitionQuery().list());
+        List<ProcessDefinition> processDefinitions = converter.from(repositoryService.createProcessDefinitionQuery().latestVersion().list());
         List<ProcessDeployedEvent> processDeployedEvents = new ArrayList<>();
         for (ProcessDefinition processDefinition : processDefinitions) {
             try (InputStream inputStream = repositoryService.getProcessModel(processDefinition.getId())) {
diff --git a/activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/ProcessDeployedEventProducerTest.java b/activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/ProcessDeployedEventProducerTest.java
index 12fefb17e95dd4e75a9d387ade1821b812285490..1ae65dc24bf767663fa38c54db21d32db5966532 100644
--- a/activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/ProcessDeployedEventProducerTest.java
+++ b/activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/ProcessDeployedEventProducerTest.java
@@ -35,6 +35,7 @@ import org.activiti.engine.repository.ProcessDefinitionQuery;
 import org.activiti.runtime.api.model.impl.APIProcessDefinitionConverter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.springframework.context.ApplicationEventPublisher;
@@ -43,7 +44,7 @@ public class ProcessDeployedEventProducerTest {
 
     private ProcessDeployedEventProducer producer;
 
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private RepositoryService repositoryService;
 
     @Mock
@@ -71,7 +72,7 @@ public class ProcessDeployedEventProducerTest {
     public void shouldCallRegisteredListenersWhenWebApplicationTypeIsServlet() {
         //given
         ProcessDefinitionQuery definitionQuery = mock(ProcessDefinitionQuery.class);
-        given(repositoryService.createProcessDefinitionQuery()).willReturn(definitionQuery);
+        given(repositoryService.createProcessDefinitionQuery().latestVersion()).willReturn(definitionQuery);
 
         List<ProcessDefinition> internalProcessDefinitions = asList(mock(ProcessDefinition.class),
                                                                     mock(ProcessDefinition.class));