diff --git a/api/src/org/labkey/api/data/dialect/BasePostgreSqlDialect.java b/api/src/org/labkey/api/data/dialect/BasePostgreSqlDialect.java
index 1af10dcbedc..1bfa267bfb4 100644
--- a/api/src/org/labkey/api/data/dialect/BasePostgreSqlDialect.java
+++ b/api/src/org/labkey/api/data/dialect/BasePostgreSqlDialect.java
@@ -743,9 +743,9 @@ else if (object instanceof Double)
     }
 
     @Override
-    protected @Nullable String getDatabaseMaintenanceSql()
+    protected SQLFragment getDatabaseMaintenanceSql()
     {
-        return "VACUUM ANALYZE;";
+        return new SQLFragment("VACUUM ANALYZE");
     }
 
     @Override
diff --git a/api/src/org/labkey/api/data/dialect/DatabaseMaintenanceTask.java b/api/src/org/labkey/api/data/dialect/DatabaseMaintenanceTask.java
index 6d1f615638e..0ee4e25f3fc 100644
--- a/api/src/org/labkey/api/data/dialect/DatabaseMaintenanceTask.java
+++ b/api/src/org/labkey/api/data/dialect/DatabaseMaintenanceTask.java
@@ -59,12 +59,14 @@ public static void run(DbScope scope, Logger log)
             log.error("Exception retrieving url", e);
         }
 
-        String sql = scope.getSqlDialect().getDatabaseMaintenanceSql();
+        SqlDialect dialect = scope.getSqlDialect();
+        SQLFragment sql = dialect.getDatabaseMaintenanceSql();
         if (null != sql)
         {
             try
             {
-                new SqlExecutor(scope).execute(SQLFragment.unsafe(sql));
+                log.info("Executing {}", sql.toDebugString(dialect));
+                new SqlExecutor(scope).execute(sql);
             }
             catch (BadSqlGrammarException e)
             {
diff --git a/api/src/org/labkey/api/data/dialect/SqlDialect.java b/api/src/org/labkey/api/data/dialect/SqlDialect.java
index 60b33cb9db9..d7525c0e081 100644
--- a/api/src/org/labkey/api/data/dialect/SqlDialect.java
+++ b/api/src/org/labkey/api/data/dialect/SqlDialect.java
@@ -360,7 +360,7 @@ public String getSqlCastTypeName(JdbcType type)
 
     public abstract String getSqlTypeName(PropertyStorageSpec prop);
 
-    protected @Nullable String getDatabaseMaintenanceSql()
+    protected @Nullable SQLFragment getDatabaseMaintenanceSql()
     {
         return null;
     }