diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9567a3a..5d1796d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 4.1.17 2025-04-17 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix issue with Postgres database cleanup when ALL databases being backed up as one file (SPLIT_DB=FALSE)
+
+
 ## 4.1.16 2025-02-21 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index 25d1cd6..c20171e 100644
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -846,7 +846,11 @@ backup_pgsql() {
         write_log debug "Not splitting database dumps into their own files"
         prepare_dbbackup
         backup_job_filename=pgsql_all_${backup_job_db_host,,}_${now}.sql
-        backup_job_filename_base=pgsql_${db}_${backup_job_db_host,,}
+        if [ "${backup_job_db_name,,}" = "all" ] ; then
+            backup_job_filename_base=pgsql_all_${backup_job_db_host,,}
+        else
+            backup_job_filename_base=pgsql_${db}_${backup_job_db_host,,}
+        fi
         compression
         pre_dbbackup all
         write_log notice "Dumping all PostgreSQL databases: '$(echo ${db_names} | xargs | tr ' ' ',')' ${compression_string}"