diff --git a/src/components/KymaModules/KymaModulesAddModule.js b/src/components/KymaModules/KymaModulesAddModule.js
index 81bb43ee43..472bf66944 100644
--- a/src/components/KymaModules/KymaModulesAddModule.js
+++ b/src/components/KymaModules/KymaModulesAddModule.js
@@ -300,11 +300,12 @@ export default function KymaModulesAddModule(props) {
                     }
                     key={channel.channel}
                     value={channel.channel}
-                  >{`${channel.channel[0].toUpperCase()}${channel.channel.slice(
-                    1,
-                  )} (v${channel.version}${
-                    channel?.isBeta ? '-beta' : ''
-                  })`}</Option>
+                    additionalText={channel?.isBeta ? 'Beta' : ''}
+                  >
+                    {`${channel.channel[0].toUpperCase()}${channel.channel.slice(
+                      1,
+                    )} (v${channel.version})`}{' '}
+                  </Option>
                 ))}
               </Select>
               {module.docsUrl ? (
diff --git a/src/components/KymaModules/KymaModulesList.js b/src/components/KymaModules/KymaModulesList.js
index 02545250da..85d26ccb5f 100644
--- a/src/components/KymaModules/KymaModulesList.js
+++ b/src/components/KymaModules/KymaModulesList.js
@@ -151,7 +151,7 @@ export function KymaModulesList(props) {
     const hasDetailsLink = resource => {
       const isInstalled =
         selectedModules?.findIndex(kymaResourceModule => {
-          return kymaResourceModule.name === resource.name;
+          return kymaResourceModule?.name === resource?.name;
         }) >= 0;
       const moduleStatus = findStatus(resource.name);
       const isDeletionFailed = moduleStatus?.state === 'Warning';