diff --git a/app/models/settings.rb b/app/models/settings.rb
index 2ef2c2ec0..06fb121d9 100644
--- a/app/models/settings.rb
+++ b/app/models/settings.rb
@@ -1,7 +1,6 @@
 class Settings < ActiveRecord::Base
-  @instance = first
-
   def self.instance
+    @instance ||= first
     @instance ||= new
   end
 end