diff --git a/CRM/Utils/System/Standalone.php b/CRM/Utils/System/Standalone.php
index 4ea0411dea82..2e4cbf17887e 100644
--- a/CRM/Utils/System/Standalone.php
+++ b/CRM/Utils/System/Standalone.php
@@ -581,7 +581,9 @@ public function getTimeZoneString() {
         return $user['timezone'];
       }
     }
-    return date_default_timezone_get();
+    // Fallback in case the setting is not yet set during the initial upgrade
+    // (or cache flush)
+    return Civi::settings()->get('standalone_timezone_default') ?? date_default_timezone_get();
   }
 
   /**
diff --git a/ext/standaloneusers/ang/afformEditMyAccount.aff.html b/ext/standaloneusers/ang/afformEditMyAccount.aff.html
index d0005b56f7fe..399dedb1218b 100644
--- a/ext/standaloneusers/ang/afformEditMyAccount.aff.html
+++ b/ext/standaloneusers/ang/afformEditMyAccount.aff.html
@@ -4,8 +4,8 @@
     <div class="af-markup"></div>
     <af-field name="username" />
     <af-field name="uf_name" defn="{help_pre: 'Email used for password resets.'}" />
-    <af-field name="timezone" defn="{help_pre: 'Set your local timezone. Date and times will be shown in this timezone when you are logged in. You can also leave it empty to use the default system timezone (which is a server setting).', input_attrs: {placeholder: 'Server default timezone'}}" />
-    <af-field name="language" defn="{help_pre: 'Set your user interface language. You can also leave it empty to use the default system language.', input_attrs: {placeholder: 'System default language'}}" />
+    <af-field name="timezone" defn="{help_pre: 'Set your local timezone. Date and times will be shown in this timezone when you are logged in. You can also leave it empty to use the default timezone (see Login Settings).', input_attrs: {placeholder: 'Default timezone'}}" />
+    <af-field name="language" defn="{help_pre: 'Set your user interface language. You can also leave it empty to use the default system language.', input_attrs: {placeholder: 'Default language'}}" />
     <div class="af-container af-container-style-pane">
       <af-field name="roles" defn="{input_type: 'DisplayOnly', input_attrs: {}}" />
     </div>
diff --git a/ext/standaloneusers/ang/afformEditUserAccount.aff.html b/ext/standaloneusers/ang/afformEditUserAccount.aff.html
index 850868c5b3cc..34f5f0755ed9 100644
--- a/ext/standaloneusers/ang/afformEditUserAccount.aff.html
+++ b/ext/standaloneusers/ang/afformEditUserAccount.aff.html
@@ -6,7 +6,7 @@
     <af-field name="contact_id" defn="{required: true, input_attrs: {quickAdd: ['civicrm/quick-add/Individual']}}" />
     <af-field name="uf_name" defn="{help_pre: ts('Email used for password resets.'), input_attrs: {placeholder: ts('Leave blank to use the primary email from the selected contact')}}" />
     <af-field name="is_active" />
-    <af-field name="timezone" defn="{help_pre: ts('Set the timezone of the user. Date and times will be shown in this timezone. You can also leave it empty to use the default system timezone (which is a server setting).'), input_attrs: {placeholder: ts('Server default timezone')}}" />
+    <af-field name="timezone" defn="{help_pre: ts('Set the timezone of the user. Date and times will be shown in this timezone. You can also leave it empty to use the default timezone (see Login Settings).'), input_attrs: {placeholder: ts('Default timezone')}}" />
     <af-field name="language" defn="{help_pre: ts('Set the user interface language of this user. You can also leave it empty to use the default system language.'), input_attrs: {placeholder: ts('System default language')}}" />
   </fieldset>
   <button class="af-button btn btn-primary" crm-icon="fa-check" ng-click="afform.submit()">Submit</button>
diff --git a/ext/standaloneusers/settings/standaloneusers.setting.php b/ext/standaloneusers/settings/standaloneusers.setting.php
index 0075da5becfa..ddaeac6d1f47 100644
--- a/ext/standaloneusers/settings/standaloneusers.setting.php
+++ b/ext/standaloneusers/settings/standaloneusers.setting.php
@@ -2,6 +2,23 @@
 use CRM_Standaloneusers_ExtensionUtil as E;
 
 return [
+  'standalone_timezone_default' => [
+    'name' => 'standalone_timezone_default',
+    'group' => 'standaloneusers',
+    'type' => 'String',
+    'default' => date_default_timezone_get(),
+    'html_type' => 'select',
+    'html_attributes' => [
+      'class' => 'huge crm-select2',
+    ],
+    'title' => E::ts('Default Timezone'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => E::ts('Default timezone for anonymous users and for users using the default timezone.'),
+    'pseudoconstant' => [
+      'callback' => ['CRM_Standaloneusers_BAO_User', 'getTimeZones'],
+    ],
+  ],
   'standaloneusers_session_max_lifetime' => [
     'name' => 'standaloneusers_session_max_lifetime',
     'group' => 'standaloneusers',