diff --git a/repository/pom.xml b/repository/pom.xml
index e039e80e7a..4e8598d007 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -400,12 +400,12 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.5.10</version>
+            <version>3.5.13</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis-spring</artifactId>
-            <version>2.0.7</version>
+            <version>3.0.2</version>
         </dependency>
 
         <!-- Activiti -->
diff --git a/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
index b43d85e24f..272458485a 100644
--- a/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
+++ b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
@@ -49,7 +49,6 @@ import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.type.TypeHandler;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
-import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.io.Resource;
@@ -564,8 +563,8 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
     /**
      * {@inheritDoc}
      */
-    public void onApplicationEvent(ApplicationEvent event) {
-        if (failFast && event instanceof ContextRefreshedEvent) {
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        if (failFast) {
             // fail-fast -> check all statements are completed
             this.sqlSessionFactory.getConfiguration().getMappedStatementNames();
         }