diff --git a/web/components/Auth.ce.vue b/web/components/Auth.ce.vue
index 4f8da6d16..2770f2069 100644
--- a/web/components/Auth.ce.vue
+++ b/web/components/Auth.ce.vue
@@ -26,7 +26,7 @@ const { authAction, stateData } = storeToRefs(serverStore);
         size="12px"
         :text="t(authAction.text)"
         :title="authAction?.title ? t(authAction?.title) : undefined"
-        @click="authAction.click ? authAction.click() : undefined"
+        @click="authAction.click?.()"
       />
     </span>
   </div>
diff --git a/web/components/HeaderOsVersion.ce.vue b/web/components/HeaderOsVersion.ce.vue
index 94c77238e..1335ad202 100644
--- a/web/components/HeaderOsVersion.ce.vue
+++ b/web/components/HeaderOsVersion.ce.vue
@@ -92,7 +92,7 @@ const updateOsStatus = computed(() => {
       :href="updateOsStatus.href ?? undefined"
       :title="updateOsStatus.title ?? undefined"
       class="group"
-      @click="updateOsStatus.click ? updateOsStatus.click() : undefined"
+      @click="updateOsStatus.click?.()"
     >
       <UiBadge
         v-if="updateOsStatus.badge"
diff --git a/web/components/KeyActions.vue b/web/components/KeyActions.vue
index 76a6bb95a..88327d47f 100644
--- a/web/components/KeyActions.vue
+++ b/web/components/KeyActions.vue
@@ -50,7 +50,7 @@ const filteredKeyActions = computed((): ServerStateDataAction[] | undefined => {
         :icon-right-hover-display="true"
         :text="t(action.text)"
         :title="action.title ? t(action.title) : undefined"
-        @click="action.click ? action.click() : undefined"
+        @click="action.click?.()"
       />
     </li>
   </ul>
diff --git a/web/components/Registration.ce.vue b/web/components/Registration.ce.vue
index 066f36df7..3fd539c09 100644
--- a/web/components/Registration.ce.vue
+++ b/web/components/Registration.ce.vue
@@ -244,7 +244,7 @@ const items = computed((): RegistrationItemProps[] => {
               :icon="authAction.icon"
               :text="t(authAction.text)"
               :title="authAction.title ? t(authAction.title) : undefined"
-              @click="authAction.click ? authAction.click() : undefined"
+              @click="authAction.click?.()"
             />
           </span>
         </header>
diff --git a/web/components/Registration/UpdateExpirationAction.vue b/web/components/Registration/UpdateExpirationAction.vue
index 3f7ec6e30..7562e1933 100644
--- a/web/components/Registration/UpdateExpirationAction.vue
+++ b/web/components/Registration/UpdateExpirationAction.vue
@@ -76,7 +76,7 @@ const output = computed(() => {
         :text="t('Extend License')"
         :title="t('Pay your annual fee to continue receiving OS updates.')"
         class="flex-grow"
-        @click="renewAction.click ? renewAction.click() : undefined"
+        @click="renewAction.click?.()"
       />
 
       <BrandButton
diff --git a/web/components/UpdateOs/CheckUpdateResponseModal.vue b/web/components/UpdateOs/CheckUpdateResponseModal.vue
index 784a2011c..74738fbce 100644
--- a/web/components/UpdateOs/CheckUpdateResponseModal.vue
+++ b/web/components/UpdateOs/CheckUpdateResponseModal.vue
@@ -256,7 +256,7 @@ const modalWidth = computed(() => {
             :icon-right-hover-display="item.iconRightHoverDisplay"
             :text="t(item.text ?? '')"
             :title="item.title ? t(item.title) : undefined"
-            @click="item.click ? item.click() : undefined"
+            @click="item.click?.()"
           />
         </div>
 
@@ -326,7 +326,7 @@ const modalWidth = computed(() => {
             :icon-right-hover-display="item.iconRightHoverDisplay"
             :text="t(item.text ?? '')"
             :title="item.title ? t(item.title) : undefined"
-            @click="item.click ? item.click() : undefined"
+            @click="item.click?.()"
           />
         </div>
       </div>
diff --git a/web/components/UpdateOs/UpdateIneligible.vue b/web/components/UpdateOs/UpdateIneligible.vue
index 4af810265..52963e891 100644
--- a/web/components/UpdateOs/UpdateIneligible.vue
+++ b/web/components/UpdateOs/UpdateIneligible.vue
@@ -95,7 +95,7 @@ watchEffect(() => {
           :text="t('Extend License')"
           :title="t('Pay your annual fee to continue receiving OS updates.')"
           class="flex-grow"
-          @click="renewAction.click ? renewAction.click() : undefined"
+          @click="renewAction.click?.()"
         />
         <!-- <BrandButton
           btn-style="black"
diff --git a/web/components/UserProfile/DropdownLaunchpad.vue b/web/components/UserProfile/DropdownLaunchpad.vue
index 18d04703c..3d8ef2d20 100644
--- a/web/components/UserProfile/DropdownLaunchpad.vue
+++ b/web/components/UserProfile/DropdownLaunchpad.vue
@@ -41,7 +41,7 @@ const showExpireTime = computed(() => (state.value === 'TRIAL' || state.value ==
             :icon="unraidApiStatus === 'restarting' ? BrandLoadingWhite : unraidApiRestartAction?.icon"
             :text="unraidApiStatus === 'restarting' ? t('Restarting unraid-api…') : t('Restart unraid-api')"
             :title="unraidApiStatus === 'restarting' ? t('Restarting unraid-api…') : t('Restart unraid-api')"
-            @click="unraidApiRestartAction?.click ? unraidApiRestartAction?.click() : undefined"
+            @click="unraidApiRestartAction?.click?.()"
           />
         </li>
       </ul>
diff --git a/web/components/UserProfile/ServerState.vue b/web/components/UserProfile/ServerState.vue
index 82638eaeb..44a4f961a 100644
--- a/web/components/UserProfile/ServerState.vue
+++ b/web/components/UserProfile/ServerState.vue
@@ -23,7 +23,7 @@ const upgradeAction = computed((): ServerStateDataAction | undefined => {
       <UpcServerStateBuy
         class="text-gamma"
         :title="t('Upgrade Key')"
-        @click="upgradeAction.click ? upgradeAction.click() : undefined"
+        @click="upgradeAction.click?.()"
       >
         <h5>Unraid OS <em><strong>{{ t(stateData.humanReadable) }}</strong></em></h5>
       </UpcServerStateBuy>
@@ -36,7 +36,7 @@ const upgradeAction = computed((): ServerStateDataAction | undefined => {
       <UpcServerStateBuy
         class="text-orange-dark relative top-[1px] hidden sm:block"
         :title="t('Purchase Key')"
-        @click="purchaseAction.click ? purchaseAction.click() : undefined"
+        @click="purchaseAction.click?.()"
       >{{ t('Purchase') }}</UpcServerStateBuy>
     </template>
   </span>