diff --git a/include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql b/include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql
index 553c33b955dabd62030821faab3c7b8d5d6bfed1..7877fbc61300a008906eb2bd8e560f4ead39f74a 100644
--- a/include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql
+++ b/include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql
@@ -19,4 +19,5 @@ ALTER TABLE `%TABLE_PREFIX%user_account`
     DROP `dst`;
 
 DELETE FROM `%TABLE_PREFIX%config`
-    WHERE `key` = 'enable_daylight_saving' AND `namespace` = 'core';
+    WHERE `key` = IN ('enable_daylight_saving', 'default_timezone_id')
+      AND `namespace` = 'core';
diff --git a/include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql b/include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql
index f99d3a28cce63de36e3db49839b9ac7a1fbed206..ff057add80cd07de39a3e32c4b310cf9c134ae52 100644
--- a/include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql
+++ b/include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql
@@ -167,6 +167,11 @@ UPDATE `%TABLE_PREFIX%config` A1
     WHERE A1.`key` = 'default_timezone_id'
       AND A1.`namespace` = 'core';
 
+UPDATE `%TABLE_PREFIX%config` A1
+    SET A1.`key` = 'default_timezone'
+    WHERE A1.`key` = 'default_timezone_id'
+      AND A1.`namespace` = 'core';
+
 DROP TABLE %TABLE_PREFIX%_timezones;
 
 ALTER TABLE `%TABLE_PREFIX%ticket`