diff --git a/vendor/PicoDb/Database.php b/vendor/PicoDb/Database.php
index 5d0beb8a7..c09d8a928 100644
--- a/vendor/PicoDb/Database.php
+++ b/vendor/PicoDb/Database.php
@@ -86,6 +86,11 @@ class Database
 
     public function escapeIdentifier($value)
     {
+        // Do not escape custom query
+        if (strpos($value, '.') !== false || strpos($value, ' ') !== false) {
+            return $value;
+        }
+
         return $this->pdo->escapeIdentifier($value);
     }
 
diff --git a/vendor/PicoDb/Drivers/Mysql.php b/vendor/PicoDb/Drivers/Mysql.php
index 22277a016..96148a1ce 100644
--- a/vendor/PicoDb/Drivers/Mysql.php
+++ b/vendor/PicoDb/Drivers/Mysql.php
@@ -70,7 +70,6 @@ class Mysql extends \PDO {
 
     public function escapeIdentifier($value)
     {
-        if (strpos($value, '.') !== false) return $value;
         return '`'.$value.'`';
     }
 }
\ No newline at end of file
diff --git a/vendor/PicoDb/Drivers/Sqlite.php b/vendor/PicoDb/Drivers/Sqlite.php
index 83b61c405..38c823ae1 100644
--- a/vendor/PicoDb/Drivers/Sqlite.php
+++ b/vendor/PicoDb/Drivers/Sqlite.php
@@ -51,7 +51,6 @@ class Sqlite extends \PDO {
 
     public function escapeIdentifier($value)
     {
-        if (strpos($value, '.') !== false) return $value;
         return '"'.$value.'"';
     }
 }
\ No newline at end of file