diff --git a/lib/site_settings/db_provider.rb b/lib/site_settings/db_provider.rb
index 4410e05eeef..8aef485c933 100644
--- a/lib/site_settings/db_provider.rb
+++ b/lib/site_settings/db_provider.rb
@@ -56,8 +56,13 @@ class SiteSettings::DbProvider
 
   # table is not in the db yet, initial migration, etc
   def table_exists?
-    @table_exists = ActiveRecord::Base.connection.table_exists? @model.table_name unless @table_exists
-    @table_exists
+    @table_exists ||= {}
+
+    unless @table_exists[current_site]
+      @table_exists[current_site] = ActiveRecord::Base.connection.table_exists?(@model.table_name)
+    end
+
+    @table_exists[current_site]
   end
 
 end