diff --git a/src/main/java/neatlogic/framework/applicationlistener/core/ModuleInitializedListenerBase.java b/src/main/java/neatlogic/framework/applicationlistener/core/ModuleInitializedListenerBase.java
index f4bce033da916f689483f8c7df9655e318a7872f..055867e1f65a5c5cd6629a495ff512e7ffdd3000 100644
--- a/src/main/java/neatlogic/framework/applicationlistener/core/ModuleInitializedListenerBase.java
+++ b/src/main/java/neatlogic/framework/applicationlistener/core/ModuleInitializedListenerBase.java
@@ -15,7 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.framework.applicationlistener.core;
 
-import neatlogic.framework.asynchronization.threadlocal.TenantContext;
 import neatlogic.framework.bootstrap.NeatLogicWebApplicationContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
@@ -27,7 +26,6 @@ public abstract class ModuleInitializedListenerBase implements ApplicationListen
 
     @PostConstruct
     public final void init() {
-        TenantContext.get().setUseMasterDatabase(true);
         myInit();
     }
 
@@ -35,7 +33,6 @@ public abstract class ModuleInitializedListenerBase implements ApplicationListen
     public final void onApplicationEvent(ContextRefreshedEvent event) {
         ApplicationContext c = event.getApplicationContext();
         if (c instanceof NeatLogicWebApplicationContext) {
-            TenantContext.get().setUseMasterDatabase(true);
             onInitialized((NeatLogicWebApplicationContext) c);
         }
     }