diff --git a/db/migrate/20150978000001_update_settings6.rb b/db/migrate/20150978000001_update_settings6.rb
index 73f85ecc7..806aa6fa8 100644
--- a/db/migrate/20150978000001_update_settings6.rb
+++ b/db/migrate/20150978000001_update_settings6.rb
@@ -1,7 +1,6 @@
 class UpdateSettings6 < ActiveRecord::Migration
   def up
-    if Setting.column_names.include?('state')
-      rename_column :settings, :state, :state_current
-    end
+    return if !Setting.column_names.include?('state')
+    rename_column :settings, :state, :state_current
   end
 end