1 files changed, 1 insertions, 5 deletions
diff --git a/lib/feature.rb b/lib/feature.rb
index a8324d99c10..0e90ad9a333 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -72,11 +72,7 @@ class Feature
     end
 
     def flipper
-      if Gitlab::SafeRequestStore.active?
-        Gitlab::SafeRequestStore[:flipper] ||= build_flipper_instance
-      else
-        @flipper ||= build_flipper_instance
-      end
+      @flipper ||= (Gitlab::SafeRequestStore[:flipper] ||= build_flipper_instance)
     end
 
     def build_flipper_instance