diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java
index 0f1bd1526..9ba0050d5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java
@@ -100,10 +100,13 @@ public class DefaultContainer implements SpiContainer {
       if (serverConfig.isDocStoreOnly()) {
         serverConfig.setDatabasePlatform(new H2Platform());
       } else {
-        if (!serverConfig.getTenantMode().isDynamicDataSource()) {
+        TenantMode tenantMode = serverConfig.getTenantMode();
+        if (!TenantMode.DB.equals(tenantMode)) {
           setDataSource(serverConfig);
-          // check the autoCommit and Transaction Isolation
-          online = checkDataSource(serverConfig);
+          if (!tenantMode.isDynamicDataSource()) {
+            // check the autoCommit and Transaction Isolation
+            online = checkDataSource(serverConfig);
+          }
         }
       }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
index 8229353c7..e8d1e6049 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -2506,7 +2506,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
    * Set the Tenant Id value to the bean.
    */
   public void setTenantId(EntityBean entityBean, Object tenantId) {
-    if (tenantId != null) {
+    if (tenant != null) {
       tenant.setValue(entityBean, tenantId);
     }
   }