diff --git a/Gemfile b/Gemfile
index 23c0a90002..30d5c9e486 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,7 +50,6 @@ gem 'doorkeeper', '~> 5.6'
 gem 'faraday-httpclient'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
-gem 'hiredis', '~> 0.6'
 gem 'hiredis-client'
 gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 5.3.0'
@@ -76,7 +75,7 @@ gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails-i18n', '~> 8.0'
 gem 'redcarpet', '~> 3.6'
-gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
+gem 'redis', '~> 5'
 gem 'rqrcode', '~> 3.0'
 gem 'ruby-progressbar', '~> 1.13'
 gem 'sanitize', '~> 7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d95dd111f..ae1182227d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -305,7 +305,6 @@ GEM
       json
     highline (3.1.2)
       reline
-    hiredis (0.6.3)
     hiredis-client (0.28.0)
       redis-client (= 0.28.0)
     hkdf (0.3.0)
@@ -709,7 +708,8 @@ GEM
     readline (0.0.4)
       reline
     redcarpet (3.6.1)
-    redis (4.8.1)
+    redis (5.4.1)
+      redis-client (>= 0.22.0)
     redis-client (0.28.0)
       connection_pool
     regexp_parser (2.11.3)
@@ -985,7 +985,6 @@ DEPENDENCIES
   haml-rails (~> 3.0)
   haml_lint
   hcaptcha (~> 7.1)
-  hiredis (~> 0.6)
   hiredis-client
   htmlentities (~> 4.3)
   http (~> 5.3.0)
@@ -1055,7 +1054,7 @@ DEPENDENCIES
   rails-i18n (~> 8.0)
   rdf-normalize (~> 0.5)
   redcarpet (~> 3.6)
-  redis (~> 4.5)
+  redis (~> 5)
   rqrcode (~> 3.0)
   rspec-github (~> 3.0)
   rspec-rails (~> 8.0)
diff --git a/app/workers/activitypub/fetch_all_replies_worker.rb b/app/workers/activitypub/fetch_all_replies_worker.rb
index 2e91a3e95b..73f2caabf8 100644
--- a/app/workers/activitypub/fetch_all_replies_worker.rb
+++ b/app/workers/activitypub/fetch_all_replies_worker.rb
@@ -49,7 +49,7 @@ class ActivityPub::FetchAllRepliesWorker
     # Workers shouldn't be returning anything, but this is used in tests
     fetched_uris
   ensure
-    @batch.remove_job(jid)
+    @batch.remove_job(jid) if jid
   end
 
   private
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
deleted file mode 100644
index 8865d85780..0000000000
--- a/config/initializers/redis.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-Redis.sadd_returns_boolean = false