diff --git a/app/models/carto/helpers/user_commons.rb b/app/models/carto/helpers/user_commons.rb
index 244bb6daf2..b51fdfc623 100644
--- a/app/models/carto/helpers/user_commons.rb
+++ b/app/models/carto/helpers/user_commons.rb
@@ -42,7 +42,7 @@ module Carto::UserCommons
                           salesforce_datasource_enabled builder_enabled geocoder_provider isolines_provider
                           routing_provider engine_enabled mapzen_routing_quota
                           mapzen_routing_block_price soft_mapzen_routing_limit no_map_logo org_admin
-                          user_render_timeout database_render_timeout frontend_version asset_host
+                          user_render_timeout database_render_timeout export_timeout frontend_version asset_host
                           state rate_limit_id public_map_quota regular_api_key_quota
                           maintenance_mode private_map_quota public_dataset_quota]
 
diff --git a/app/models/concerns/cartodb_central_synchronizable.rb b/app/models/concerns/cartodb_central_synchronizable.rb
index 77f6126fa9..ec27c1d3f9 100644
--- a/app/models/concerns/cartodb_central_synchronizable.rb
+++ b/app/models/concerns/cartodb_central_synchronizable.rb
@@ -115,7 +115,7 @@ module CartodbCentralSynchronizable
          salesforce_datasource_enabled viewer geocoder_provider
          isolines_provider routing_provider engine_enabled builder_enabled
          mapzen_routing_quota mapzen_routing_block_price soft_mapzen_routing_limit no_map_logo
-         user_render_timeout database_render_timeout state industry company phone job_role
+         user_render_timeout database_render_timeout export_timeout state industry company phone job_role
          password_reset_token password_reset_sent_at maintenance_mode company_employees use_case private_map_quota
          session_salt public_dataset_quota dashboard_viewed_at email_verification_token email_verification_sent_at)
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index bb18ca95c5..915eb7dd23 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -787,7 +787,8 @@ class User < Sequel::Model
                           'db',                        user_timeout,
                           'db_public',                 database_timeout,
                           'render',                    user_render_timeout,
-                          'render_public',             database_render_timeout
+                          'render_public',             database_render_timeout,
+                          'export',                    export_timeout
     save_rate_limits
   end
 
diff --git a/app/services/carto/user_metadata_export_service.rb b/app/services/carto/user_metadata_export_service.rb
index 6cfd62a86c..b6b731e8c2 100644
--- a/app/services/carto/user_metadata_export_service.rb
+++ b/app/services/carto/user_metadata_export_service.rb
@@ -50,7 +50,7 @@ module Carto
       mobile_gis_extension mobile_max_open_users mobile_max_private_users
       viewer salesforce_datasource_enabled builder_enabled geocoder_provider isolines_provider routing_provider
       github_user_id engine_enabled mapzen_routing_quota mapzen_routing_block_price soft_mapzen_routing_limit
-      no_map_logo org_admin last_name user_render_timeout database_render_timeout frontend_version
+      no_map_logo org_admin last_name user_render_timeout database_render_timeout export_timeout frontend_version
       asset_host state company phone industry job_role password_reset_token password_reset_sent_at maintenance_mode
       company_employees use_case private_map_quota session_salt public_dataset_quota
       email_verification_token email_verification_sent_at
diff --git a/db/migrate/20211122155410_add_export_timeout_to_users.rb b/db/migrate/20211122155410_add_export_timeout_to_users.rb
new file mode 100644
index 0000000000..9345b10e7f
--- /dev/null
+++ b/db/migrate/20211122155410_add_export_timeout_to_users.rb
@@ -0,0 +1,13 @@
+require 'carto/db/migration_helper'
+
+include Carto::Db::MigrationHelper
+
+migration(
+  Proc.new do
+    # The 0 value means: "apply default export timeout" (defined by the SQL API)
+    add_column :users, :export_timeout, :integer, default: 0, null: false
+  end,
+  Proc.new do
+    drop_column :users, :export_timeout
+  end
+)