diff --git a/app/models/carto/analysis.rb b/app/models/carto/analysis.rb
index e6ffb243a0..332a59b92f 100644
--- a/app/models/carto/analysis.rb
+++ b/app/models/carto/analysis.rb
@@ -42,15 +42,7 @@ class Carto::Analysis < ActiveRecord::Base
     username = layer_options[:user_name] || layer.user.username
     table_name = layer_options[:table_name]
 
-    qualified_table_name = if layer.user.organization_user?
-                             safe_schema_and_table_quoting(username, table_name)
-                           else
-                             if table_name.present?
-                               safe_schema_and_table_quoting('public', table_name)
-                             else
-                               table_name
-                             end
-                           end
+    qualified_table_name = safe_schema_and_table_quoting(layer.user.database_schema, table_name)
 
     analysis_definition = {
       id: 'abcdefghijklmnopqrstuvwxyz'[index] + '0',
diff --git a/lib/carto/table_utils.rb b/lib/carto/table_utils.rb
index 010bcb4717..85ba6bc87a 100644
--- a/lib/carto/table_utils.rb
+++ b/lib/carto/table_utils.rb
@@ -11,6 +11,8 @@ module Carto
     end
 
     def safe_schema_and_table_quoting(schema_name, table_name)
+      return nil if table_name.nil?
+
       safe_schema = safe_schema_name_quoting(schema_name)
       safe_table_name = safe_table_name_quoting(table_name)
       "#{safe_schema}.#{safe_table_name}"