diff --git a/gulliver/system/class.database_base.php b/gulliver/system/class.database_base.php
index 577fd1c34..d24d7abd5 100755
--- a/gulliver/system/class.database_base.php
+++ b/gulliver/system/class.database_base.php
@@ -88,6 +88,10 @@ class database_base implements iDatabase
         $this->sQuoteCharacter = '';
     }
 
+    public function getDatabaseName() {
+        return $this->sDataBase;
+    }
+
     /**
      * Function generateDropTableSQL
      *
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 8cc4fd197..cd699f6ef 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -394,7 +394,7 @@ class workspaceTools
      */
     private function getDatabase($rbac = false)
     {
-        if (isset($this->db) && $this->db->isConnected() &&  $rbac == false) {
+        if (isset($this->db) && $this->db->isConnected() && ($rbac == false && $this->db->getDatabaseName() == $this->dbName)) {
             return $this->db;
         }