diff --git a/frontend/src/components/App/PluginSettings/PluginSettings.stories.tsx b/frontend/src/components/App/PluginSettings/PluginSettings.stories.tsx
index 3ed2ae0f04..700ed48a9e 100644
--- a/frontend/src/components/App/PluginSettings/PluginSettings.stories.tsx
+++ b/frontend/src/components/App/PluginSettings/PluginSettings.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryFn } from '@storybook/react';
+import { PluginInfo } from '../../../plugin/pluginsSlice';
 import { TestContext } from '../../../test';
 import { PluginSettingsPure, PluginSettingsPureProps } from './PluginSettings';
 
@@ -40,6 +41,17 @@ function createDemoData(arrSize: number, useHomepage?: boolean) {
   return pluginArr;
 }
 
+/**
+ * create demo data for pluginsEnabledList
+ */
+function createDemoEnabledList(arr: PluginInfo[]): Record<string, boolean> {
+  const enabledList = arr.reduce((acc, p) => {
+    acc[p.name] = !!p.isEnabled;
+    return acc;
+  }, {} as Record<string, boolean>);
+  return enabledList;
+}
+
 /**
  * Creation of data arrays ranging from 0 to 50 to demo state of empty, few, many, and large numbers of data objects.
  * NOTE: The numbers used are up to the users preference.
@@ -55,6 +67,7 @@ const demoEmpty = createDemoData(0);
 export const FewItems = Template.bind({});
 FewItems.args = {
   plugins: demoFew,
+  pluginsEnabledList: createDemoEnabledList(demoFew),
   onSave: plugins => {
     console.log('demo few', plugins);
   },
@@ -63,12 +76,14 @@ FewItems.args = {
 export const Empty = Template.bind({});
 Empty.args = {
   plugins: demoEmpty,
+  pluginsEnabledList: createDemoEnabledList(demoEmpty),
 };
 
 /** NOTE: The save button will load by default on plugin page regardless of data */
 export const DefaultSaveEnable = Template.bind({});
 DefaultSaveEnable.args = {
   plugins: demoFewSaveEnable,
+  pluginsEnabledList: createDemoEnabledList(demoFewSaveEnable),
   onSave: plugins => {
     console.log('demo few', plugins);
   },
@@ -78,6 +93,7 @@ DefaultSaveEnable.args = {
 export const ManyItems = Template.bind({});
 ManyItems.args = {
   plugins: demoMany,
+  pluginsEnabledList: createDemoEnabledList(demoMany),
   onSave: plugins => {
     console.log('demo many', plugins);
   },
@@ -86,6 +102,7 @@ ManyItems.args = {
 export const MoreItems = Template.bind({});
 MoreItems.args = {
   plugins: demoMore,
+  pluginsEnabledList: createDemoEnabledList(demoMore),
   onSave: plugins => {
     console.log('demo more', plugins);
   },
@@ -94,6 +111,7 @@ MoreItems.args = {
 export const EmptyHomepageItems = Template.bind({});
 EmptyHomepageItems.args = {
   plugins: demoHomepageEmpty,
+  pluginsEnabledList: createDemoEnabledList(demoHomepageEmpty),
   onSave: (plugins: any) => {
     console.log('Empty Homepage', plugins);
   },
diff --git a/frontend/src/components/App/PluginSettings/PluginSettings.tsx b/frontend/src/components/App/PluginSettings/PluginSettings.tsx
index c55060b610..e3bf26888e 100644
--- a/frontend/src/components/App/PluginSettings/PluginSettings.tsx
+++ b/frontend/src/components/App/PluginSettings/PluginSettings.tsx
@@ -3,12 +3,12 @@ import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
 import Link from '@mui/material/Link';
 import { MRT_Row } from 'material-react-table';
-import { useEffect, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import helpers from '../../../helpers';
 import { useFilterFunc } from '../../../lib/util';
-import { PluginInfo, reloadPage, setPluginSettings } from '../../../plugin/pluginsSlice';
+import { PluginInfo, reloadPage, setEnablePlugin } from '../../../plugin/pluginsSlice';
 import { useTypedSelector } from '../../../redux/reducers/reducers';
 import { Link as HeadlampLink, SectionBox, Table } from '../../common';
 import SectionFilterHeader from '../../common/SectionFilterHeader';
@@ -24,6 +24,7 @@ import SectionFilterHeader from '../../common/SectionFilterHeader';
  */
 export interface PluginSettingsPureProps {
   plugins: PluginInfo[];
+  pluginsEnabledList: Record<string, boolean>;
   onSave: (plugins: PluginInfo[]) => void;
   saveAlwaysEnable?: boolean;
 }
@@ -92,87 +93,66 @@ const EnableSwitch = (props: SwitchProps) => {
 
 /** PluginSettingsPure is the main component to where we render the plugin data. */
 export function PluginSettingsPure(props: PluginSettingsPureProps) {
+  const dispatch = useDispatch();
+
   const { t } = useTranslation(['translation']);
 
   /** Plugin arr to be rendered to the page from prop data */
-  const pluginArr: any = props.plugins ? props.plugins : [];
-
-  /** enableSave state enables the save button when changes are made to the plugin list */
-  const [enableSave, setEnableSave] = useState(false);
+  const [pluginArr, setPluginArr] = useState<PluginInfo[]>(props.plugins);
 
   /**
-   * pluginChanges state is the array of plugin data and any current changes made by the user to a plugin's "Enable" field via toggler.
-   * The name and origin fields are split for consistency.
+   * pendingPluginsEnabled is either from the local storage or the prop data
    */
-  const [pluginChanges, setPluginChanges] = useState(() =>
-    pluginArr.map((plugin: PluginInfo) => {
-      const [author, name] = plugin.name.includes('@')
-        ? plugin.name.split(/\/(.+)/)
-        : [null, plugin.name];
-
-      return {
-        ...plugin,
-        displayName: name ?? plugin.name,
-        origin: plugin.origin ?? author?.substring(1) ?? t('translation|Unknown'),
-      };
-    })
+  const [pendingPluginsEnabled, setPendingPluginsEnabled] = useState<Record<string, boolean>>(
+    props.pluginsEnabledList
   );
 
   /**
-   * useEffect to control the rendering of the save button.
-   * By default, the enableSave is set to false.
-   * If props.plugins matches pluginChanges enableSave is set to false, disabling the save button.
+   * useEffect / useMemo to update the pluginArr state with the prop data
    */
-  useEffect(() => {
-    /** This matcher function compares the fields of name and isEnabled of each object in props.plugins to each object in pluginChanges */
-    function matcher(objA: PluginInfo, objB: PluginInfo) {
-      return objA.name === objB.name && objA.isEnabled === objB.isEnabled;
-    }
-
-    /**
-     * arrayComp returns true if each object in both arrays are identical by name and isEnabled.
-     * If both arrays are identical in this scope, then no changes need to be saved.
-     * If they do not match, there are changes in the pluginChanges array that can be saved and thus enableSave should be enabled.
-     */
-    const arrayComp = props.plugins.every((val, key) => matcher(val, pluginChanges[key]));
-
-    /** For storybook usage, determines if the save button should be enabled by default */
-    if (props.saveAlwaysEnable) {
-      setEnableSave(true);
-    } else {
-      if (arrayComp) {
-        setEnableSave(false);
-      }
-      if (!arrayComp) {
-        setEnableSave(true);
-      }
-    }
-  }, [pluginChanges]);
+  const enableSave = useMemo(() => {
+    return !pluginArr.every((plugin: { name: string }) => {
+      // if the user selected state is the same as saved
+      return (
+        Boolean(props.pluginsEnabledList[plugin.name]) ===
+        Boolean(pendingPluginsEnabled[plugin.name])
+      );
+    });
+  }, [pendingPluginsEnabled, pluginArr, props.pluginsEnabledList]);
 
   /**
    * onSaveButton function to be called once the user clicks the Save button.
    * This function then takes the current state of the pluginChanges array and inputs it to the onSave prop function.
    */
   function onSaveButtonHandler() {
-    props.onSave(pluginChanges);
+    dispatch(setEnablePlugin(pendingPluginsEnabled));
+    dispatch(reloadPage());
   }
 
   /**
-   * On change function handler to control the enableSave state and update the pluginChanges state.
-   * This function is called on every plugin toggle action and recreates the state for pluginChanges.
+   * On change function handler to control the enableSave state and update the pluginArr state.
+   * This function is called on every plugin toggle action and recreates the state for pluginArr.
    * Once the user clicks a toggle, the Save button is also rendered via setEnableSave.
    */
-  function switchChangeHanlder(plug: { name: any }) {
+  function switchChangeHandler(plug: { name: any }) {
     const plugName = plug.name;
 
-    setPluginChanges((currentInfo: any[]) =>
-      currentInfo.map((p: { name: any; isEnabled: any }) => {
+    setPluginArr([
+      ...pluginArr.map(p => {
         if (p.name === plugName) {
-          return { ...p, isEnabled: !p.isEnabled };
+          return {
+            ...p,
+            isEnabled: !p.isEnabled,
+          };
         }
         return p;
-      })
-    );
+      }),
+    ]);
+
+    setPendingPluginsEnabled({
+      ...pendingPluginsEnabled,
+      [plugName]: !pendingPluginsEnabled[plugName],
+    });
   }
 
   return (
@@ -235,7 +215,9 @@ export function PluginSettingsPure(props: PluginSettingsPureProps) {
                 if (plugin.isCompatible === false) {
                   return t('translation|Incompatible');
                 }
-                return plugin.isEnabled ? t('translation|Enabled') : t('translation|Disabled');
+                return pendingPluginsEnabled[plugin.name]
+                  ? t('translation|Enabled')
+                  : t('translation|Disabled');
               },
             },
             {
@@ -247,8 +229,8 @@ export function PluginSettingsPure(props: PluginSettingsPureProps) {
                 return (
                   <EnableSwitch
                     aria-label={`Toggle ${plugin.name}`}
-                    checked={plugin.isEnabled}
-                    onChange={() => switchChangeHanlder(plugin)}
+                    checked={pendingPluginsEnabled[plugin.name]}
+                    onChange={() => switchChangeHandler(plugin)}
                     color="primary"
                     name={plugin.name}
                   />
@@ -260,7 +242,7 @@ export function PluginSettingsPure(props: PluginSettingsPureProps) {
           ]
             // remove the enable column if we're not in app mode
             .filter(el => !(el.header === t('translation|Enable') && !helpers.isElectron()))}
-          data={pluginChanges}
+          data={pluginArr}
           filterFunction={useFilterFunc<PluginInfo>(['.name'])}
         />
       </SectionBox>
@@ -284,13 +266,71 @@ export function PluginSettingsPure(props: PluginSettingsPureProps) {
 export default function PluginSettings() {
   const dispatch = useDispatch();
 
-  const pluginSettings = useTypedSelector(state => state.plugins.pluginSettings);
+  const pluginData = useTypedSelector(state => state.plugins.pluginData);
+
+  /**
+   * We need to search for the local storage before using it in the slice later
+   */
+  const oldLocalEnabledList = localStorage.getItem('headlampPluginSettings');
+  const localEnabledList = localStorage.getItem('enabledPluginsList');
+
+  let pluginsEnabledList;
+
+  /**
+   * WIP making the old settings compatible with the new settings
+   */
+
+  if (oldLocalEnabledList) {
+    const oldSettings = JSON.parse(oldLocalEnabledList);
+
+    const newSettings = oldSettings.map((setting: { name: string; isEnabled: boolean }) => {
+      return {
+        name: setting.name,
+        isEnabled: setting.isEnabled,
+      };
+    });
+
+    pluginsEnabledList = newSettings.reduce(
+      (acc: Record<string, boolean>, p: { name: string; isEnabled: boolean }) => {
+        acc[p.name] = !!p.isEnabled;
+        return acc;
+      },
+      {} as Record<string, boolean>
+    );
+
+    localStorage.setItem('enabledPluginsList', JSON.stringify(pluginsEnabledList));
+    localStorage.removeItem('headlampPluginSettings');
+
+    dispatch(setEnablePlugin(pluginsEnabledList));
+
+    dispatch(reloadPage());
+  } else {
+    /**
+     * If `localEnabledList` exists, parse it and assign it to `pluginsEnabledList`.
+     * This indicates that previous plugin settings have been saved and can be used.
+     *
+     * If `localEnabledList` does not exist, it means the settings are not initialized
+     * and no previous plugin settings have been saved. In this case, default the plugins
+     * to being disabled to allow users to turn on their desired plugins.
+     */
+    if (localEnabledList) {
+      pluginsEnabledList = JSON.parse(localEnabledList) as Record<string, boolean>;
+    } else {
+      pluginsEnabledList = pluginData.reduce((acc, p) => {
+        acc[p.name] = !!p.isEnabled;
+        return acc;
+      }, {} as Record<string, boolean>);
+
+      dispatch(setEnablePlugin(pluginsEnabledList));
+      dispatch(reloadPage());
+    }
+  }
 
   return (
     <PluginSettingsPure
-      plugins={pluginSettings}
-      onSave={plugins => {
-        dispatch(setPluginSettings(plugins));
+      plugins={pluginData}
+      pluginsEnabledList={pluginsEnabledList}
+      onSave={() => {
         dispatch(reloadPage());
       }}
     />
diff --git a/frontend/src/components/App/PluginSettings/PluginSettingsDetails.tsx b/frontend/src/components/App/PluginSettings/PluginSettingsDetails.tsx
index 776f916498..f1d2cc9883 100644
--- a/frontend/src/components/App/PluginSettings/PluginSettingsDetails.tsx
+++ b/frontend/src/components/App/PluginSettings/PluginSettingsDetails.tsx
@@ -54,7 +54,7 @@ const PluginSettingsDetailsInitializer = (props: { plugin: PluginInfo }) => {
 };
 
 export default function PluginSettingsDetails() {
-  const pluginSettings = useTypedSelector(state => state.plugins.pluginSettings);
+  const pluginSettings = useTypedSelector(state => state.plugins.pluginData);
   const { name } = useParams<{ name: string }>();
 
   const plugin = useMemo(() => {
diff --git a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.DefaultSaveEnable.stories.storyshot b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.DefaultSaveEnable.stories.storyshot
index 8683e457d2..896790cda0 100644
--- a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.DefaultSaveEnable.stories.storyshot
+++ b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.DefaultSaveEnable.stories.storyshot
@@ -470,9 +470,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%200"
-                      >
-                        plugin a 0
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -488,12 +486,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-0"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -516,9 +509,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%201"
-                      >
-                        plugin a 1
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -534,12 +525,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-1"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -562,9 +548,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%202"
-                      >
-                        plugin a 2
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -580,12 +564,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-2"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -608,9 +587,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%203"
-                      >
-                        plugin a 3
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -626,12 +603,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-3"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -654,9 +626,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%204"
-                      >
-                        plugin a 4
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -672,12 +642,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-4"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -813,19 +778,5 @@
         </div>
       </div>
     </div>
-    <div
-      class="MuiBox-root css-ova7y8"
-    >
-      <button
-        class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-wlshgd-MuiButtonBase-root-MuiButton-root"
-        tabindex="0"
-        type="button"
-      >
-        Save & Apply
-        <span
-          class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
-        />
-      </button>
-    </div>
   </div>
 </body>
\ No newline at end of file
diff --git a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.EmptyHomepageItems.stories.storyshot b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.EmptyHomepageItems.stories.storyshot
index 7be5dd0372..896790cda0 100644
--- a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.EmptyHomepageItems.stories.storyshot
+++ b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.EmptyHomepageItems.stories.storyshot
@@ -470,9 +470,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%200"
-                      >
-                        plugin a 0
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -488,12 +486,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-0"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -516,9 +509,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%201"
-                      >
-                        plugin a 1
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -534,12 +525,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-1"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -562,9 +548,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%202"
-                      >
-                        plugin a 2
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -580,12 +564,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-2"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -608,9 +587,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%203"
-                      >
-                        plugin a 3
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -626,12 +603,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-3"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -654,9 +626,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%204"
-                      >
-                        plugin a 4
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -672,12 +642,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-4"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
diff --git a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.FewItems.stories.storyshot b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.FewItems.stories.storyshot
index 7be5dd0372..896790cda0 100644
--- a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.FewItems.stories.storyshot
+++ b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.FewItems.stories.storyshot
@@ -470,9 +470,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%200"
-                      >
-                        plugin a 0
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -488,12 +486,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-0"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -516,9 +509,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%201"
-                      >
-                        plugin a 1
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -534,12 +525,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-1"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -562,9 +548,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%202"
-                      >
-                        plugin a 2
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -580,12 +564,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-2"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -608,9 +587,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%203"
-                      >
-                        plugin a 3
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -626,12 +603,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-3"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -654,9 +626,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%204"
-                      >
-                        plugin a 4
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -672,12 +642,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-4"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
diff --git a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.ManyItems.stories.storyshot b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.ManyItems.stories.storyshot
index a8942489d7..ea764a3db4 100644
--- a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.ManyItems.stories.storyshot
+++ b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.ManyItems.stories.storyshot
@@ -470,9 +470,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%200"
-                      >
-                        plugin a 0
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -488,12 +486,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-0"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -516,9 +509,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%201"
-                      >
-                        plugin a 1
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -534,12 +525,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-1"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -562,9 +548,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%202"
-                      >
-                        plugin a 2
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -580,12 +564,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-2"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -608,9 +587,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%203"
-                      >
-                        plugin a 3
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -626,12 +603,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-3"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -654,9 +626,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%204"
-                      >
-                        plugin a 4
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -672,12 +642,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-4"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -700,9 +665,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%205"
-                      >
-                        plugin a 5
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -718,12 +681,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-5"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -746,9 +704,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%206"
-                      >
-                        plugin a 6
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -764,12 +720,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-6"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -792,9 +743,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%207"
-                      >
-                        plugin a 7
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -810,12 +759,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-7"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -838,9 +782,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%208"
-                      >
-                        plugin a 8
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -856,12 +798,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-8"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -884,9 +821,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%209"
-                      >
-                        plugin a 9
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -902,12 +837,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-9"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -930,9 +860,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2010"
-                      >
-                        plugin a 10
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -948,12 +876,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-10"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -976,9 +899,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2011"
-                      >
-                        plugin a 11
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -994,12 +915,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-11"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -1022,9 +938,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2012"
-                      >
-                        plugin a 12
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -1040,12 +954,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-12"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -1068,9 +977,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2013"
-                      >
-                        plugin a 13
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -1086,12 +993,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-13"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -1114,9 +1016,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2014"
-                      >
-                        plugin a 14
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -1132,12 +1032,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-14"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
diff --git a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.MoreItems.stories.storyshot b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.MoreItems.stories.storyshot
index 1131f02347..f0fa82254a 100644
--- a/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.MoreItems.stories.storyshot
+++ b/frontend/src/components/App/PluginSettings/__snapshots__/PluginSettings.MoreItems.stories.storyshot
@@ -470,9 +470,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%200"
-                      >
-                        plugin a 0
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -488,12 +486,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-0"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -516,9 +509,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%201"
-                      >
-                        plugin a 1
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -534,12 +525,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-1"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -562,9 +548,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%202"
-                      >
-                        plugin a 2
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -580,12 +564,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-2"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -608,9 +587,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%203"
-                      >
-                        plugin a 3
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -626,12 +603,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-3"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -654,9 +626,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%204"
-                      >
-                        plugin a 4
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -672,12 +642,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-4"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -700,9 +665,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%205"
-                      >
-                        plugin a 5
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -718,12 +681,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-5"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -746,9 +704,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%206"
-                      >
-                        plugin a 6
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -764,12 +720,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-6"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -792,9 +743,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%207"
-                      >
-                        plugin a 7
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -810,12 +759,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-7"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -838,9 +782,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%208"
-                      >
-                        plugin a 8
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -856,12 +798,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-8"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -884,9 +821,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%209"
-                      >
-                        plugin a 9
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -902,12 +837,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-9"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -930,9 +860,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2010"
-                      >
-                        plugin a 10
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -948,12 +876,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-10"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -976,9 +899,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2011"
-                      >
-                        plugin a 11
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -994,12 +915,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-11"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -1022,9 +938,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2012"
-                      >
-                        plugin a 12
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -1040,12 +954,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-12"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -1068,9 +977,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2013"
-                      >
-                        plugin a 13
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -1086,12 +993,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-13"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
@@ -1114,9 +1016,7 @@
                       <a
                         class="MuiTypography-root MuiTypography-inherit MuiTypography-alignRight MuiLink-root MuiLink-underlineHover css-1g9r2nj-MuiTypography-root-MuiLink-root"
                         href="/settings/plugins/plugin%20a%2014"
-                      >
-                        plugin a 14
-                      </a>
+                      />
                     </h6>
                     <span
                       class="MuiTypography-root MuiTypography-caption css-1yjsbnr-MuiTypography-root"
@@ -1132,12 +1032,7 @@
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-ac5fut-MuiTableCell-root"
                     data-index="2"
                   >
-                    <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineHover css-srrjpp-MuiTypography-root-MuiLink-root"
-                      href="https://example.com/plugin-link-14"
-                    >
-                      Unknown
-                    </a>
+                    Unknown
                   </td>
                   <td
                     class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-14fks5x-MuiTableCell-root"
diff --git a/frontend/src/plugin/Plugins.tsx b/frontend/src/plugin/Plugins.tsx
index 46521ec7b5..8a28888f72 100644
--- a/frontend/src/plugin/Plugins.tsx
+++ b/frontend/src/plugin/Plugins.tsx
@@ -8,7 +8,7 @@ import helpers from '../helpers';
 import { UI_INITIALIZE_PLUGIN_VIEWS } from '../redux/actions/actions';
 import { useTypedSelector } from '../redux/reducers/reducers';
 import { fetchAndExecutePlugins } from './index';
-import { pluginsLoaded, setPluginSettings } from './pluginsSlice';
+import { pluginsLoaded, setPluginData } from './pluginsSlice';
 
 /**
  * For discovering and executing plugins.
@@ -26,7 +26,8 @@ export default function Plugins() {
   const history = useHistory();
   const { t } = useTranslation();
 
-  const settingsPlugins = useTypedSelector(state => state.plugins.pluginSettings);
+  const settingsPlugins = useTypedSelector(state => state.plugins.pluginData);
+  const enabledPlugins = useTypedSelector(state => state.plugins.enabledPlugins);
 
   // only run on first load
   useEffect(() => {
@@ -34,8 +35,9 @@ export default function Plugins() {
 
     fetchAndExecutePlugins(
       settingsPlugins,
+      enabledPlugins,
       updatedSettingsPackages => {
-        dispatch(setPluginSettings(updatedSettingsPackages));
+        dispatch(setPluginData(updatedSettingsPackages));
       },
       incompatiblePlugins => {
         const pluginList = Object.values(incompatiblePlugins)
diff --git a/frontend/src/plugin/index.ts b/frontend/src/plugin/index.ts
index d42a63f672..98678aa7a1 100644
--- a/frontend/src/plugin/index.ts
+++ b/frontend/src/plugin/index.ts
@@ -137,6 +137,7 @@ export async function initializePlugins() {
 export function filterSources(
   sources: string[],
   packageInfos: PluginInfo[],
+  enabledPlugins: Record<string, boolean>,
   appMode: boolean,
   compatibleVersion: string,
   settingsPackages?: PluginInfo[]
@@ -161,9 +162,8 @@ export function filterSources(
 
     // settingsPackages might have a different order or length than packageInfos
     // If it's not in the settings don't enable the plugin.
-    const enabledInSettings =
-      settingsPackages[settingsPackages.findIndex(x => x.name === packageInfo.name)]?.isEnabled ===
-      true;
+
+    const enabledInSettings = enabledPlugins[packageInfo.name];
     return enabledInSettings;
   });
 
@@ -242,6 +242,7 @@ export function updateSettingsPackages(
  */
 export async function fetchAndExecutePlugins(
   settingsPackages: PluginInfo[],
+  enabledPlugins: Record<string, boolean>,
   onSettingsChange: (plugins: PluginInfo[]) => void,
   onIncompatible: (plugins: Record<string, PluginInfo>) => void
 ) {
@@ -298,6 +299,7 @@ export async function fetchAndExecutePlugins(
   const { sourcesToExecute, incompatiblePlugins } = filterSources(
     sources,
     packageInfos,
+    enabledPlugins,
     helpers.isElectron(),
     compatibleHeadlampPluginVersion,
     updatedSettingsPackages
diff --git a/frontend/src/plugin/pluginSlice.test.tsx b/frontend/src/plugin/pluginSlice.test.tsx
index 805f6f31e3..3ba719ece1 100644
--- a/frontend/src/plugin/pluginSlice.test.tsx
+++ b/frontend/src/plugin/pluginSlice.test.tsx
@@ -11,7 +11,8 @@ const initialState: PluginsState = {
   /** Once the plugins have been fetched and executed. */
   loaded: false,
   /** If plugin settings are saved use those. */
-  pluginSettings: JSON.parse(localStorage.getItem('headlampPluginSettings') || '[]'),
+  enabledPlugins: JSON.parse(localStorage.getItem('headlampPluginSettings') || '{}'),
+  pluginData: [],
 };
 
 // Mock React component for testing
@@ -24,7 +25,7 @@ describe('pluginsSlice reducers', () => {
     const existingPluginName = 'test-plugin';
     const initialStateWithPlugin: PluginsState = {
       ...initialState,
-      pluginSettings: [
+      pluginData: [
         {
           name: existingPluginName,
           settingsComponent: undefined,
@@ -41,15 +42,15 @@ describe('pluginsSlice reducers', () => {
 
     const newState = pluginsSlice.reducer(initialStateWithPlugin, action);
 
-    expect(newState.pluginSettings[0].settingsComponent).toBeDefined();
-    expect(newState.pluginSettings[0].displaySettingsComponentWithSaveButton).toBe(true);
+    expect(newState.pluginData[0].settingsComponent).toBeDefined();
+    expect(newState.pluginData[0].displaySettingsComponentWithSaveButton).toBe(true);
   });
 
   test('should not modify state when plugin name does not match any existing plugin', () => {
     const nonExistingPluginName = 'non-existing-plugin';
     const initialStateWithPlugin: PluginsState = {
       ...initialState,
-      pluginSettings: [
+      pluginData: [
         {
           name: 'existing-plugin',
           settingsComponent: undefined,
diff --git a/frontend/src/plugin/pluginsSlice.ts b/frontend/src/plugin/pluginsSlice.ts
index 37e3277ac0..4128bd2c7c 100644
--- a/frontend/src/plugin/pluginsSlice.ts
+++ b/frontend/src/plugin/pluginsSlice.ts
@@ -90,14 +90,17 @@ export type PluginInfo = {
 export interface PluginsState {
   /** Have plugins finished executing? */
   loaded: boolean;
+  /** Information for the plugin's enable */
+  enabledPlugins: Record<string, boolean>;
   /** Information stored by settings about plugins. */
-  pluginSettings: PluginInfo[];
+  pluginData: PluginInfo[];
 }
 const initialState: PluginsState = {
   /** Once the plugins have been fetched and executed. */
   loaded: false,
   /** If plugin settings are saved use those. */
-  pluginSettings: JSON.parse(localStorage.getItem('headlampPluginSettings') || '[]'),
+  enabledPlugins: JSON.parse(localStorage.getItem('enabledPluginsList') || '[]'),
+  pluginData: [],
 };
 
 export const pluginsSlice = createSlice({
@@ -107,12 +110,15 @@ export const pluginsSlice = createSlice({
     pluginsLoaded(state) {
       state.loaded = true;
     },
-    /**
-     * Save the plugin settings. To both the store, and localStorage.
-     */
-    setPluginSettings(state, action: PayloadAction<PluginInfo[]>) {
-      state.pluginSettings = action.payload;
-      localStorage.setItem('headlampPluginSettings', JSON.stringify(action.payload));
+
+    /** Updates the local storage for plugin enable settings */
+    setEnablePlugin(state, action: PayloadAction<Record<string, boolean>>) {
+      state.enabledPlugins = action.payload;
+      localStorage.setItem('enabledPluginsList', JSON.stringify(action.payload));
+    },
+
+    setPluginData(state, action: PayloadAction<PluginInfo[]>) {
+      state.pluginData = action.payload;
     },
     /** Reloads the browser page */
     reloadPage() {
@@ -130,7 +136,7 @@ export const pluginsSlice = createSlice({
       }>
     ) {
       const { name, component, displaySaveButton } = action.payload;
-      state.pluginSettings = state.pluginSettings.map(plugin => {
+      state.pluginData = state.pluginData.map(plugin => {
         if (plugin.name === name) {
           return {
             ...plugin,
@@ -144,7 +150,12 @@ export const pluginsSlice = createSlice({
   },
 });
 
-export const { pluginsLoaded, setPluginSettings, setPluginSettingsComponent, reloadPage } =
-  pluginsSlice.actions;
+export const {
+  pluginsLoaded,
+  setEnablePlugin,
+  setPluginData,
+  setPluginSettingsComponent,
+  reloadPage,
+} = pluginsSlice.actions;
 
 export default pluginsSlice.reducer;