diff --git a/desktop/app/src/ui/components/Button.tsx b/desktop/app/src/ui/components/Button.tsx
index 8c71d5b97..d4f203d16 100644
--- a/desktop/app/src/ui/components/Button.tsx
+++ b/desktop/app/src/ui/components/Button.tsx
@@ -434,7 +434,7 @@ export function SandyButton({
             <Menu.Item
               onClick={(e) => {
                 // @ts-ignore this event args are bound to electron, remove in the future
-                item.click();
+                item.click(item);
                 if (item.checked !== undefined) {
                   // keep the menu item for check lists
                   e.domEvent.stopPropagation();
diff --git a/desktop/app/src/utils/pluginUtils.tsx b/desktop/app/src/utils/pluginUtils.tsx
index b5429cc42..2092345e1 100644
--- a/desktop/app/src/utils/pluginUtils.tsx
+++ b/desktop/app/src/utils/pluginUtils.tsx
@@ -87,6 +87,7 @@ export function getEnabledOrExportPersistedStatePlugins(
   const enabledPlugins = starredPlugin[appName]
     ? starredPlugin[appName]
         .map((pluginName) => pluginsMap.get(pluginName)!)
+        .filter(Boolean)
         .filter((plugin) => {
           return !plugin.exportPersistedState;
         })
@@ -105,7 +106,8 @@ export function getEnabledOrExportPersistedStatePlugins(
         id: plugin,
         label: getPluginTitle(plugins.devicePlugins.get(plugin)!),
       };
-    });
+    })
+    .filter(Boolean);
   // Plugins which have defined exportPersistedState.
   const exportPersistedStatePlugins = client.plugins
     .filter((name) => {