diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index 5c2c59c2321..99ae65a5aab 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -103,6 +103,7 @@ You could use this simplified accounting in case you work with an (external) acc
         ],
         'web.assets_frontend': [
             'account/static/src/js/account_portal_sidebar.js',
+            'account/static/src/js/account_portal.js',
         ],
         'web.assets_tests': [
             'account/static/tests/tours/**/*',
diff --git a/addons/account/static/src/js/account_portal.js b/addons/account/static/src/js/account_portal.js
new file mode 100644
index 00000000000..f4f6a9a1cc2
--- /dev/null
+++ b/addons/account/static/src/js/account_portal.js
@@ -0,0 +1,12 @@
+/** @odoo-module */
+
+import publicWidget from 'web.public.widget';
+
+publicWidget.registry.PortalHomeCounters.include({
+    /**
+     * @override
+     */
+    _getCountersAlwaysDisplayed() {
+        return this._super(...arguments).concat(['invoice_count']);
+    },
+});
diff --git a/addons/portal/static/src/js/portal.js b/addons/portal/static/src/js/portal.js
index da8cda28308..fff2910367d 100644
--- a/addons/portal/static/src/js/portal.js
+++ b/addons/portal/static/src/js/portal.js
@@ -70,27 +70,51 @@ publicWidget.registry.PortalHomeCounters = publicWidget.Widget.extend({
     // Private
     //--------------------------------------------------------------------------
 
+    /**
+     * Return a list of counters name linked to a line that we want to keep
+     * regardless of the number of documents present
+     * @private
+     * @returns {Array}
+     */
+    _getCountersAlwaysDisplayed() {
+        return [];
+    },
+
     /**
      * @private
      */
     async _updateCounters(elem) {
         const numberRpc = 3;
-        const needed = this.$('[data-placeholder_count]')
-                                .map((i, o) => $(o).data('placeholder_count'))
-                                .toArray();
+        const needed = Object.values(this.el.querySelectorAll('[data-placeholder_count]'))
+                                .map(documentsCounterEl => documentsCounterEl.dataset['placeholder_count']);
         const counterByRpc = Math.ceil(needed.length / numberRpc);  // max counter, last can be less
+        const countersAlwaysDisplayed = this._getCountersAlwaysDisplayed();
 
         const proms = [...Array(Math.min(numberRpc, needed.length)).keys()].map(async i => {
-            await this._rpc({
+            const documentsCountersData = await this._rpc({
                 route: "/my/counters",
                 params: {
                     counters: needed.slice(i * counterByRpc, (i + 1) * counterByRpc)
                 },
-            }).then(data => {
-                Object.keys(data).map(k => this.$("[data-placeholder_count='" + k + "']").text(data[k]));
             });
+            Object.keys(documentsCountersData).forEach(counterName => {
+                const documentsCounterEl = this.el.querySelector(`[data-placeholder_count='${counterName}']`);
+                documentsCounterEl.textContent = documentsCountersData[counterName];
+                // The element is hidden by default, only show it if its counter is > 0 or if it's in the list of counters always shown
+                if (documentsCountersData[counterName] !== 0 || countersAlwaysDisplayed.includes(counterName)) {
+                    documentsCounterEl.parentElement.classList.remove('d-none');
+                }
+            });
+            return documentsCountersData;
+        });
+        return Promise.all(proms).then((results) => {
+            const counters = results.reduce((prev, current) => Object.assign({...prev, ...current}), {});
+            this.el.querySelector('.o_portal_doc_spinner').remove();
+            // Display a message when there are no documents available if there are no counters > 0 and no counters always shown
+            if (!countersAlwaysDisplayed.length && !Object.values(counters).filter((val) => val > 0).length) {
+                this.el.querySelector('.o_portal_no_doc_message').classList.remove('d-none');
+            }
         });
-        return Promise.all(proms);
     },
 });
 
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 3ed601ce08e..9ff33680d61 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -187,6 +187,8 @@
                 <div class="oe_structure" id="oe_structure_portal_my_home_1"/>
                 <h3>Documents</h3>
                 <div class="o_portal_docs list-group">
+                    <div class="o_portal_doc_spinner spinner-border text-o-color-2 align-self-center mt-5"/>
+                    <p class="o_portal_no_doc_message d-none">No Documents to display</p>
                 </div>
             </div>
             <div class="oe_structure" id="oe_structure_portal_my_home_2"/>
@@ -194,7 +196,7 @@
     </template>
 
     <template id="portal_docs_entry" name="My Portal Docs Entry">
-        <a t-att-href="url" t-att-title="title" class="list-group-item list-group-item-action d-flex align-items-center justify-content-between">
+        <a t-att-href="url" t-att-title="title" class="list-group-item list-group-item-action d-flex align-items-center justify-content-between d-none">
             <t t-esc="title"/>
             <t t-if='count'>
                 <span class="badge text-bg-secondary rounded-pill" t-esc="count"/>
diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index 0437a1f411b..5e1d6549f5a 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -76,6 +76,7 @@ This module contains all the common features of Sales Management and eCommerce.
         'web.assets_frontend': [
             'sale/static/src/scss/sale_portal.scss',
             'sale/static/src/js/sale_portal_sidebar.js',
+            'sale/static/src/js/sale_portal.js',
             'sale/static/src/js/payment_form.js',
         ],
         'web.assets_tests': [
diff --git a/addons/sale/static/src/js/sale_portal.js b/addons/sale/static/src/js/sale_portal.js
new file mode 100644
index 00000000000..28354ab0fc0
--- /dev/null
+++ b/addons/sale/static/src/js/sale_portal.js
@@ -0,0 +1,12 @@
+/** @odoo-module */
+
+import publicWidget from 'web.public.widget';
+
+publicWidget.registry.PortalHomeCounters.include({
+    /**
+     * @override
+     */
+    _getCountersAlwaysDisplayed() {
+        return this._super(...arguments).concat(['quotation_count', 'order_count']);
+    },
+});