diff --git a/eslint.config.mjs b/eslint.config.mjs
index 294e489..4439c0c 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -118,7 +118,7 @@ export default [
     rules: {
       "vue/multi-word-component-names": "off",
       "vue/no-side-effects-in-computed-properties": "off",
-      "vue/return-in-computed-property": "off",
+      "vue/return-in-computed-property": "error",
       "vue/no-parsing-error": "error",
       "vue/valid-v-else": "error",
       "vue/no-deprecated-v-on-native-modifier": "error",
diff --git a/src/components/Discover/Conformance/MoreModal.vue b/src/components/Discover/Conformance/MoreModal.vue
index 446aa88..37c1f08 100644
--- a/src/components/Discover/Conformance/MoreModal.vue
+++ b/src/components/Discover/Conformance/MoreModal.vue
@@ -195,6 +195,7 @@ const caseData = computed(() => {
     });
     return data;
   }
+  return [];
 });
 
 const columnData = computed(() => {
diff --git a/src/components/Discover/Map/Filter/Attributes.vue b/src/components/Discover/Map/Filter/Attributes.vue
index 88c3792..f47ae26 100644
--- a/src/components/Discover/Map/Filter/Attributes.vue
+++ b/src/components/Discover/Map/Filter/Attributes.vue
@@ -428,8 +428,9 @@ const valueData = computed(() => {
         item.type === selectedAttName.value.type &&
         item.key === selectedAttName.value.key,
     );
-    return data;
+    return data ?? null;
   }
+  return null;
 });
 
 // Compute slider data; time format: millisecond timestamps
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 20d7916..2cc6ae0 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -177,6 +177,8 @@ const disabledSave = computed(() => {
       return !(
         conformanceFilterTempCheckId.value || conformanceLogTempCheckId.value
       );
+    default:
+      return true;
   }
 });
 
diff --git a/src/views/Files/Files.vue b/src/views/Files/Files.vue
index a9e8aa0..8b4a52b 100644
--- a/src/views/Files/Files.vue
+++ b/src/views/Files/Files.vue
@@ -560,6 +560,7 @@ const allFiles = computed(() => {
     );
     return sortFiles;
   }
+  return [];
 });
 
 /**