diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java
index d49b56dff..a2e73012a 100644
--- a/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java
+++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java
@@ -25,6 +25,7 @@ import java.time.Instant;
 import java.time.LocalDate;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.function.Supplier;
 
@@ -73,7 +74,16 @@ public class ExtDBImporterService {
             log.warn("maxDate={} too high, set current date", maxDate);
             maxDate = LocalDate.now();
         }
-        return String.format("SELECT * FROM \"%s\".\"Crossrate\" where \"Date\">='%s'",
+        if (schema != null) {
+            if (!schema.contains("\"") && !schema.toLowerCase(Locale.ROOT).equals(schema)) { // PostgreSQL style with quote
+                schema = "\"" + schema + "\"";
+            }
+        }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(schema)) {
+            return String.format("SELECT * FROM crossrate where Date>='%s'",
+                    maxDate);
+        }
+        return String.format("SELECT * FROM %s.crossrate where Date>='%s'",
                 schema, maxDate);
     }
 
diff --git a/clearing-parent/extdb-importer/src/main/resources/application.properties b/clearing-parent/extdb-importer/src/main/resources/application.properties
index b5c8d9414..da543f422 100644
--- a/clearing-parent/extdb-importer/src/main/resources/application.properties
+++ b/clearing-parent/extdb-importer/src/main/resources/application.properties
@@ -11,6 +11,7 @@ extdb-importer.cron.load-from-db-cron=0 0/5 * * * ?
 extdb-importer.database.login=clearing
 extdb-importer.database.password=Aa111111
 extdb-importer.database.schema=CBRInfo
+#extdb-importer.database.schema=public
 extdb-importer.database.url=jdbc:postgresql://10.200.200.133:5432/clearing?currentSchema=CBRInfo
 extdb-importer.database.driver=org.postgresql.Driver