diff --git a/.env.docker b/.env.docker
index d2578d1be..fe6c19d4b 100644
--- a/.env.docker
+++ b/.env.docker
@@ -134,6 +134,13 @@ APP_TIMEZONE="UTC"
 # See: https://docs.pixelfed.org/technical-documentation/config/#max_photo_size-kb
 #MAX_PHOTO_SIZE="15000"
 
+# The max number of photos allowed per post.
+#
+# Defaults to "4".
+#
+# See: https://docs.pixelfed.org/technical-documentation/config/#max_album_length
+#MAX_ALBUM_LENGTH="4"
+
 # Update the max avatar size, in kB.
 #
 # Defaults to "2000" (2MB).
@@ -162,13 +169,6 @@ APP_TIMEZONE="UTC"
 # See: https://docs.pixelfed.org/technical-documentation/config/#max_name_length
 #MAX_NAME_LENGTH="30"
 
-# The max number of photos allowed per post.
-#
-# Defaults to "4".
-#
-# See: https://docs.pixelfed.org/technical-documentation/config/#max_album_length
-#MAX_ALBUM_LENGTH="4"
-
 # Resize and optimize image uploads.
 #
 # Defaults to "true".
diff --git a/docker/shared/root/docker/entrypoint.d/04-defaults.envsh b/docker/shared/root/docker/entrypoint.d/04-defaults.envsh
index fe906120a..a55a56e6c 100755
--- a/docker/shared/root/docker/entrypoint.d/04-defaults.envsh
+++ b/docker/shared/root/docker/entrypoint.d/04-defaults.envsh
@@ -12,8 +12,8 @@ entrypoint-set-script-name "${BASH_SOURCE[0]}"
 
 load-config-files
 
-: "${MAX_PHOTO_SIZE:=}"
-: "${MAX_ALBUM_LENGTH:=}"
+: "${MAX_PHOTO_SIZE:=15000}"
+: "${MAX_ALBUM_LENGTH:=4}"
 
 # We assign a 1MB buffer to the just-in-time calculated max post size to allow for fields and overhead
 : "${POST_MAX_SIZE_BUFFER:=1M}"