diff --git a/config/initializers/cache_store.rb b/config/initializers/cache_store.rb
index 1c9f1eed2..33dedc81d 100644
--- a/config/initializers/cache_store.rb
+++ b/config/initializers/cache_store.rb
@@ -1,5 +1,5 @@
 Rails.application.configure do
-  if Rails.env.test?
+  if Rails.env.test? || Danbooru.config.redis_url.blank?
     cache_config = [:memory_store, { size: 32.megabytes }]
   else
     cache_config = [