diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropPrimaryKeyTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropPrimaryKeyTask.java
index 1437a5373084..e8a85034ec4a 100644
--- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropPrimaryKeyTask.java
+++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropPrimaryKeyTask.java
@@ -115,7 +115,7 @@ private String generatePrimaryKeyNameSql() {
 				return null; // Irrelevant:  We don't need to run the SQL for these databases.
 			case POSTGRES_9_4:
 				return "SELECT constraint_name " + "FROM information_schema.table_constraints "
-						+ "WHERE table_schema = 'public' "
+						+ "WHERE table_schema = coalesce(current_schema(), 'public') "
 						+ "AND constraint_type = 'PRIMARY KEY' "
 						+ "AND table_name = ?";
 			case ORACLE_12C: