1 files changed, 5 insertions, 1 deletions
diff --git a/lib/feature.rb b/lib/feature.rb
index 3847f880be0..6c9bbc39844 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -326,7 +326,11 @@ module Feature
     end
 
     def l2_cache_backend
-      ::Gitlab::Redis::FeatureFlag.cache_store
+      if !Gitlab::Utils.to_boolean(ENV['GITLAB_USE_FEATURE_FLAG_REDIS'])
+        Rails.cache
+      else
+        ::Gitlab::Redis::FeatureFlag.cache_store
+      end
     end
 
     def log(key:, action:, **extra)