3 files changed, 19 insertions, 13 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cdab88fd..0e6f12af9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
-# [v5.6.3-nightly.2](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.0...v5.6.3-nightly.2) (2021-09-14)
+# [v5.6.3-nightly.3](https://github.com/getferdi/ferdi/compare/v5.6.3-nightly.2...v5.6.3-nightly.3) (2021-09-15)
+
+### Under the hood
+
+- Defensive programming to avoid javascript error for unread badges 💖 @vraravam
+
+# [v5.6.3-nightly.2](https://github.com/getferdi/ferdi/compare/v5.6.2...v5.6.3-nightly.2) (2021-09-14)
 
 ### Features
 
diff --git a/src/webview/badge.ts b/src/webview/badge.ts
index 753e90fef..024e29b3f 100644
--- a/src/webview/badge.ts
+++ b/src/webview/badge.ts
@@ -26,17 +26,17 @@ export class BadgeHandler {
     return Math.max(adjustedNumber, 0);
   }
 
-  setBadge(direct: string | number, indirect: string | number) {
-    if (this.countCache.direct.toString() === direct.toString()
-        && this.countCache.indirect.toString() === indirect.toString()) {
-      return;
-    }
-
+  setBadge(direct: string | number | undefined | null, indirect: string | number | undefined | null) {
     const count = {
       direct: this.safeParseInt(direct),
       indirect: this.safeParseInt(indirect),
     };
 
+    if (this.countCache.direct.toString() === count.direct.toString()
+        && this.countCache.indirect.toString() === count.indirect.toString()) {
+      return;
+    }
+
     debug('Sending badge count to host', count);
     ipcRenderer.sendToHost('message-counts', count);
 
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index 2bd6bad8d..157da7693 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -35,12 +35,12 @@ class RecipeWebview {
   /**
    * Set the unread message badge
    *
-   * @param {int} direct      Set the count of direct messages
-   *                          eg. Slack direct mentions, or a
-   *                          message to @channel
-   * @param {int} indirect    Set a badge that defines there are
-   *                          new messages but they do not involve
-   *                          me directly to me eg. in a channel
+   * @param {string | number | undefined | null} direct      Set the count of direct messages
+   *                                                         eg. Slack direct mentions, or a
+   *                                                         message to @channel
+   * @param {string | number | undefined | null} indirect    Set a badge that defines there are
+   *                                                         new messages but they do not involve
+   *                                                         me directly to me eg. in a channel
    */
   setBadge(direct = 0, indirect = 0) {
     this.badgeHandler.setBadge(direct, indirect);