diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0a3abba02..3a9db8a87 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1830,7 +1830,6 @@ Style/UnneededCondition:
     - 'app/controllers/messages_controller.rb'
     - 'app/controllers/previews_controller.rb'
     - 'app/models/issue.rb'
-    - 'app/models/setting.rb'
 
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 9eaaaec33..b5c8ca2e5 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -107,13 +107,12 @@ class Setting < ActiveRecord::Base
 
   # Returns the value of the setting named name
   def self.[](name)
-    v = @cached_settings[name]
-    v ? v : (@cached_settings[name] = find_or_default(name).value)
+    @cached_settings[name] ||= find_or_default(name).value
   end
 
   def self.[]=(name, v)
     setting = find_or_default(name)
-    setting.value = (v ? v : "")
+    setting.value = v || ''
     @cached_settings[name] = nil
     setting.save
     setting.value