diff --git a/CHANGELOG.json b/CHANGELOG.json
index ad0f12bf..1e9cfe82 100644
--- a/CHANGELOG.json
+++ b/CHANGELOG.json
@@ -1,4 +1,14 @@
 [{
+  "version": "2.0.6",
+  "channel": "stable",
+  "releasedAt": 1489325983503,
+  "urgency": "low",
+  "changes": {
+    "General": [
+      "Fixed an internal error related to notifications count."
+    ]
+  }
+}, {
   "version": "2.0.5",
   "channel": "beta",
   "releasedAt": 1487851951578,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb02178e..40bfa307 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [2.0.6](https://github.com/Aluxian/Messenger-for-Desktop/tree/v2.0.6) (2017-12-03)
+
+[Full Changelog](https://github.com/Aluxian/Messenger-for-Desktop/compare/v2.0.5...v2.0.6) • [Download](https://github.com/Aluxian/Messenger-for-Desktop/releases/tag/v2.0.6)
+
+**General**
+
+- Fixed an internal error related to notifications count.
+
 ## [2.0.5-beta](https://github.com/Aluxian/Messenger-for-Desktop/tree/v2.0.5) (2017-23-02)
 
 [Full Changelog](https://github.com/Aluxian/Messenger-for-Desktop/compare/v2.0.4...v2.0.5) • [Download](https://github.com/Aluxian/Messenger-for-Desktop/releases/tag/v2.0.5)
diff --git a/src/package.json b/src/package.json
index 1a383ee9..1a38dcc7 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,8 +1,8 @@
 {
   "name": "messengerfordesktop",
   "productName": "Messenger for Desktop",
-  "version": "2.0.5",
-  "versionChannel": "beta",
+  "version": "2.0.6",
+  "versionChannel": "stable",
   "description": "A simple & beautiful desktop client for Facebook Messenger.",
   "wvUrl": "https://www.messenger.com/login",
   "wvUrlWork": "https://work.facebook.com/chat",
diff --git a/src/scripts/browser/managers/main-window-manager.js b/src/scripts/browser/managers/main-window-manager.js
index 7c4d758f..926bdd7c 100755
--- a/src/scripts/browser/managers/main-window-manager.js
+++ b/src/scripts/browser/managers/main-window-manager.js
@@ -311,7 +311,9 @@ class MainWindowManager extends EventEmitter {
    * Update the notifications count everywhere.
    */
   notifCountChanged (count, badgeDataUrl) {
-    this.notifManager.unreadCount = count;
+    if (this.notifManager) {
+      this.notifManager.unreadCount = count;
+    }
 
     // Set icon badge
     if (prefs.get('show-notifications-badge')) {
@@ -328,7 +330,9 @@ class MainWindowManager extends EventEmitter {
     }
 
     // Update tray
-    this.trayManager.unreadCountUpdated(count);
+    if (this.trayManager) {
+      this.trayManager.unreadCountUpdated(count);
+    }
 
     // Update window title
     this.prefixWindowTitle(count ? '(' + count + ') ' : '');