diff --git a/CHANGELOG.md b/CHANGELOG.md
index 116b1b06..e1695255 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 This changelog starts with the restructured 1.0.0 release that happened after context isolation changes. The changelogs here should more-or-less mirror the ones that get shown in the client but probably with less formatting and pizzazz.
 
+## 1.6.2
+
+### Added
+
+### Removed
+
+### Changed
+
+### Fixed
+- Fixed non-loading issue due to changed UserSettingsStore
+
 ## 1.6.1
 
 ### Added
diff --git a/package.json b/package.json
index 449e9466..f8a0994a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "betterdiscord",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "description": "Enhances Discord by adding functionality and themes.",
     "main": "src/index.js",
     "scripts": {
diff --git a/renderer/src/data/changelog.js b/renderer/src/data/changelog.js
index ee4f6084..4ab4f1ab 100644
--- a/renderer/src/data/changelog.js
+++ b/renderer/src/data/changelog.js
@@ -1,14 +1,12 @@
 // fixed, improved, added, progress
 export default {
-    description: "Big things are coming soon, please be patient!",
+    description: "Sorry for all the updates lately, Discord has been making a lot of internal changes!",
     changes: [
         {
             title: "Fixes",
             type: "fixed",
             items: [
-                "Fixed an issue where `waitForModule` would not return the found module.",
-                "Fixed an issue where broken addon METAs could prevent BD from fully loading.",
-                "Fixed an issue where developer badges stopped rendering."
+                "Fixed an issue where BD wouldn't load on canary/ptb.",
             ]
         }
     ]
diff --git a/renderer/src/modules/discordmodules.js b/renderer/src/modules/discordmodules.js
index 906bf215..8a36c9eb 100644
--- a/renderer/src/modules/discordmodules.js
+++ b/renderer/src/modules/discordmodules.js
@@ -36,7 +36,7 @@ export default Utilities.memoizeObject({
 
     /* Current User Info, State and Settings */
     get UserInfoStore() {return WebpackModules.getByProps("getToken");},
-    get UserSettingsStore() {return WebpackModules.getByProps("guildPositions");},
+    get UserSettingsStore() {return WebpackModules.getByProps("getAllSettings", "theme");},
     get AccountManager() {return WebpackModules.getByProps("register", "login");},
     get UserSettingsUpdater() {return WebpackModules.getByProps("updateRemoteSettings");},
     get OnlineWatcher() {return WebpackModules.getByProps("isOnline");},
diff --git a/renderer/src/modules/localemanager.js b/renderer/src/modules/localemanager.js
index 860f7584..4c101795 100644
--- a/renderer/src/modules/localemanager.js
+++ b/renderer/src/modules/localemanager.js
@@ -6,7 +6,7 @@ import Events from "./emitter";
 const {Dispatcher, UserSettingsStore} = DiscordModules;
 
 export default new class LocaleManager {
-    get discordLocale() {return UserSettingsStore.locale;}
+    get discordLocale() {return UserSettingsStore?.locale ?? this.defaultLocale;}
     get defaultLocale() {return "en-US";}
 
     constructor() {