diff --git a/web/pgadmin/dashboard/static/js/dashboard.js b/web/pgadmin/dashboard/static/js/dashboard.js
index 0294022db..668349319 100644
--- a/web/pgadmin/dashboard/static/js/dashboard.js
+++ b/web/pgadmin/dashboard/static/js/dashboard.js
@@ -1078,9 +1078,10 @@ define('pgadmin.dashboard', [
           }
         });
 
-        // Handle button clicks
-        $('button').off('click').on('click',() => {
-          switch (this.id) {
+        $('button').off('click').on('click', (e) => {
+          let $this = $(e.currentTarget);
+          let targetID = $this.length ? $this[0].id : undefined;
+          switch (targetID) {
           case 'btn_server_activity_refresh':
             pgAdmin.Dashboard.render_grid_data(div_server_activity);
             break;