diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java
index 1a0b4cfbb..f9dff8e49 100644
--- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java
+++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java
@@ -1,7 +1,6 @@
 package org.maxkey.autoconfigure;
 
 import java.util.ArrayList;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,7 +20,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2
 @EnableOpenApi
 @EnableKnife4j
-@MapperScan(basePackages = {"org.maxkey"})
 public class SwaggerConfig {
 
     @Value("${maxkey.swagger.title}")
diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java
index 1c337f725..db3fc5735 100644
--- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java
+++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java
@@ -24,6 +24,7 @@ import org.apache.ibatis.io.VFS;
 import org.apache.mybatis.jpa.SpringBootVFS;
 import org.maxkey.configuration.ApplicationConfig;
 import org.maxkey.web.InitializeContext;
+import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -33,6 +34,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 import org.springframework.context.ConfigurableApplicationContext;
 
 @SpringBootApplication
+@MapperScan("org.maxkey.persistence.mapper,")
 public class MaxKeyApplication extends SpringBootServletInitializer {
     private static final Logger _logger = LoggerFactory.getLogger(MaxKeyApplication.class);
 
diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
index 02c89be5e..3ca020746 100644
--- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
+++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
@@ -57,12 +57,10 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-
 @Configuration
 //@ImportResource(locations = { "classpath:spring/maxkey.xml" })
 @PropertySource(ConstantsProperties.applicationPropertySource)
 @PropertySource(ConstantsProperties.maxKeyPropertySource)
-@MapperScan("org.maxkey.persistence.mapper,")
 @ComponentScan(basePackages = {
         "org.maxkey.configuration",
         "org.maxkey.domain",