diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 4938601..2461c70 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -32,6 +32,14 @@ class Schema extends DatabaseSchema {
    */
   protected $tableInformation = array();
 
+  public function __construct($connection) {
+    parent::__construct($connection);
+    $current_schema = $this->connection->query("SELECT current_schema()")->fetchField();
+    if (!empty($current_schema)) {
+      $this->defaultSchema = $current_schema;
+    }
+  }
+
   /**
    * The maximum allowed length for index, primary key and constraint names.
    *