diff --git a/postnl-card.js b/postnl-card.js
index a48621b..7f8d7fe 100755
--- a/postnl-card.js
+++ b/postnl-card.js
@@ -303,7 +303,9 @@ class PostNL extends LitElement {
       ${this.renderLetters()}
       ${this.renderDelivery()}
       ${this.renderDistribution()}
-      ${this.renderWarning()}
+      ${this.renderMomentJSWarning()}
+      ${this.renderLetterWarning()}
+
       </ha-card>
     `
   }
@@ -319,7 +321,8 @@ class PostNL extends LitElement {
     `
   }
 
-  renderWarning() {
+  // Remove when mandatory
+  renderMomentJSWarning() {
     if (window.moment) return ''
 
     return html`
@@ -329,6 +332,19 @@ class PostNL extends LitElement {
     `
   }
 
+  renderLetterWarning() {
+    if (!this.letterObject) return ''
+
+    // Remove undefined check after the first of june
+    if (typeof this.letterObject.attributes.enabled === 'undefined' || this.letterObject.attributes.enabled) return ''
+
+    return html`
+      <footer>
+        It seems you have set the letter object, but you haven't activated this within PostNL yet. Consider removing the letter object from the card or activate this option in PostNL.
+      </footer>
+    `
+  }
+
   renderLettersInfo() {
     if (!this.letterObject) return ''
 
diff --git a/tracker.json b/tracker.json
index f9fae39..6cf73f9 100644
--- a/tracker.json
+++ b/tracker.json
@@ -1,9 +1,9 @@
 {
   "postnl-card": {
-    "version": "0.9.4",
+    "version": "0.9.5",
     "updated_at": "2019-05-15",
     "visit_repo": "https://github.com/peternijssen/lovelace-postnl",
-    "remote_location": "https://github.com/peternijssen/lovelace-postnl/releases/download/0.9.4/postnl-card.js",
+    "remote_location": "https://github.com/peternijssen/lovelace-postnl/releases/download/0.9.5/postnl-card.js",
     "changelog": "https://github.com/peternijssen/lovelace-postnl/releases/latest"
   }
 }