diff --git a/CHANGELOG.md b/CHANGELOG.md
index c79103a320..82ed72fdfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.2.25] - 2025-09-16
+
+### Fixed
+
+- Fix processing of remote edited statuses with new media and no text (#35970 by @unfokus)
+
 ## [4.2.24] - 2025-08-05
 
 ### Security
diff --git a/docker-compose.yml b/docker-compose.yml
index 4b1fe34b60..81c3477c7b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.24
+    image: ghcr.io/mastodon/mastodon:v4.2.25
     restart: always
     env_file: .env.production
     command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -77,7 +77,7 @@ services:
 
   streaming:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.24
+    image: ghcr.io/mastodon/mastodon:v4.2.25
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -95,7 +95,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.24
+    image: ghcr.io/mastodon/mastodon:v4.2.25
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 731bb55352..50fc54afa1 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      24
+      25
     end
 
     def default_prerelease