diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 5bfae9c97..de566e670 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -94,7 +94,7 @@
 						@start="() => drag = true"
 						@end="saveListPosition"
 						handle=".handle"
-						:disabled="n.id < 0 || null"
+						:disabled="n.id < 0 || undefined"
 						tag="transition-group"
 						item-key="id"
 						:data-namespace-id="n.id"
diff --git a/src/components/input/fancycheckbox.vue b/src/components/input/fancycheckbox.vue
index 20e8381e4..204efeec6 100644
--- a/src/components/input/fancycheckbox.vue
+++ b/src/components/input/fancycheckbox.vue
@@ -2,7 +2,7 @@
 	<div :class="{'is-disabled': disabled}" class="fancycheckbox">
 		<input
 			:checked="checked"
-			:disabled="disabled || null"
+			:disabled="disabled || undefined"
 			:id="checkBoxId"
 			@change="(event) => updateData(event.target.checked)"
 			type="checkbox"/>
diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 61878e413..d63fd6642 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -36,7 +36,7 @@
 			<label class="label">{{ $t('task.attributes.priority') }}</label>
 			<div class="control single-value-control">
 				<priority-select
-					:disabled="!filters.usePriority || null"
+					:disabled="!filters.usePriority || undefined"
 					v-model.number="filters.priority"
 					@change="setPriority"
 				/>
@@ -54,7 +54,7 @@
 				<percent-done-select
 					v-model.number="filters.percentDone"
 					@change="setPercentDoneFilter"
-					:disabled="!filters.usePercentDone || null"
+					:disabled="!filters.usePercentDone || undefined"
 				/>
 				<fancycheckbox
 					v-model="filters.usePercentDone"
diff --git a/src/components/misc/api-config.vue b/src/components/misc/api-config.vue
index 3869fa8e3..16a62a57b 100644
--- a/src/components/misc/api-config.vue
+++ b/src/components/misc/api-config.vue
@@ -16,7 +16,7 @@
 					/>
 				</div>
 				<div class="control">
-					<x-button @click="setApiUrl" :disabled="apiUrl === '' || null">
+					<x-button @click="setApiUrl" :disabled="apiUrl === '' || undefined">
 						{{ $t('apiConfig.change') }}
 					</x-button>
 				</div>
diff --git a/src/components/misc/pagination.vue b/src/components/misc/pagination.vue
index 4379af395..00eeebc94 100644
--- a/src/components/misc/pagination.vue
+++ b/src/components/misc/pagination.vue
@@ -6,13 +6,13 @@
 		v-if="totalPages > 1"
 	>
 		<router-link
-			:disabled="currentPage === 1 || null"
+			:disabled="currentPage === 1 || undefined"
 			:to="getRouteForPagination(currentPage - 1)"
 			class="pagination-previous">
 			{{ $t('misc.previous') }}
 		</router-link>
 		<router-link
-			:disabled="currentPage === totalPages || null"
+			:disabled="currentPage === totalPages || undefined"
 			:to="getRouteForPagination(currentPage + 1)"
 			class="pagination-next">
 			{{ $t('misc.next') }}
diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue
index 81fb910ed..e7f9e9585 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -5,7 +5,7 @@
 		:icon="iconName"
 		v-tooltip="tooltipText"
 		@click="changeSubscription"
-		:disabled="disabled || null"
+		:disabled="disabled || undefined"
 	>
 		{{ buttonText }}
 	</x-button>
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index 1afa71731..6505c2fde 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -11,7 +11,7 @@
 			<div class="control">
 				<input
 					:class="{ disabled: taskService.loading }"
-					:disabled="taskService.loading || null"
+					:disabled="taskService.loading || undefined"
 					@change="editTaskSubmit()"
 					class="input"
 					id="tasktext"
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index 3c036f5fb..1972c73d9 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -8,7 +8,7 @@
 		</h3>
 
 		<input
-			:disabled="attachmentService.loading || null"
+			:disabled="attachmentService.loading || undefined"
 			@change="uploadNewAttachment()"
 			id="files"
 			multiple
diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue
index c114063ed..5d350e2d4 100644
--- a/src/components/tasks/partials/defer-task.vue
+++ b/src/components/tasks/partials/defer-task.vue
@@ -30,7 +30,7 @@
 		<flat-pickr
 			:class="{ disabled: taskService.loading }"
 			:config="flatPickerConfig"
-			:disabled="taskService.loading || null"
+			:disabled="taskService.loading || undefined"
 			class="input"
 			v-model="dueDate"
 		/>
diff --git a/src/views/filters/FilterEdit.vue b/src/views/filters/FilterEdit.vue
index d31298438..8c6bfebf4 100644
--- a/src/views/filters/FilterEdit.vue
+++ b/src/views/filters/FilterEdit.vue
@@ -13,7 +13,7 @@
 				<div class="control">
 					<input
 						:class="{ 'disabled': filterService.loading}"
-						:disabled="filterService.loading || null"
+						:disabled="filterService.loading || undefined"
 						@keyup.enter="saveSavedFilter"
 						class="input"
 						id="title"
diff --git a/src/views/filters/FilterNew.vue b/src/views/filters/FilterNew.vue
index 59a6c0bbc..314b8342d 100644
--- a/src/views/filters/FilterNew.vue
+++ b/src/views/filters/FilterNew.vue
@@ -13,7 +13,7 @@
 							<input
 								v-model="savedFilter.title"
 								:class="{ 'disabled': savedFilterService.loading}"
-								:disabled="savedFilterService.loading || null"
+								:disabled="savedFilterService.loading || undefined"
 								class="input"
 								id="Title"
 								:placeholder="$t('filters.attributes.titlePlaceholder')"
diff --git a/src/views/list/ListKanban.vue b/src/views/list/ListKanban.vue
index b9851f311..9957322ca 100644
--- a/src/views/list/ListKanban.vue
+++ b/src/views/list/ListKanban.vue
@@ -183,7 +183,7 @@
 			<div class="bucket new-bucket" v-if="canWrite && !loading && buckets.length > 0">
 				<input
 					:class="{'is-loading': loading}"
-					:disabled="loading || null"
+					:disabled="loading || undefined"
 					@blur="() => showNewBucketInput = false"
 					@keyup.enter="createNewBucket"
 					@keyup.esc="$event.target.blur()"
diff --git a/src/views/list/settings/edit.vue b/src/views/list/settings/edit.vue
index 4aff764ea..d516702c9 100644
--- a/src/views/list/settings/edit.vue
+++ b/src/views/list/settings/edit.vue
@@ -12,7 +12,7 @@
 			<div class="control">
 				<input
 					:class="{ 'disabled': listService.loading}"
-					:disabled="listService.loading || null"
+					:disabled="listService.loading || undefined"
 					@keyup.enter="save"
 					class="input"
 					id="title"
diff --git a/src/views/migrator/MigrateService.vue b/src/views/migrator/MigrateService.vue
index 58746d939..9921a8560 100644
--- a/src/views/migrator/MigrateService.vue
+++ b/src/views/migrator/MigrateService.vue
@@ -15,7 +15,7 @@
 					/>
 					<x-button
 						:loading="migrationService.loading"
-						:disabled="migrationService.loading || null"
+						:disabled="migrationService.loading || undefined"
 						@click="$refs.uploadInput.click()"
 					>
 						{{ $t('migrate.upload') }}
@@ -25,7 +25,7 @@
 					<p>{{ $t('migrate.authorize', {name: migrator.name}) }}</p>
 					<x-button
 						:loading="migrationService.loading"
-						:disabled="migrationService.loading || null"
+						:disabled="migrationService.loading || undefined"
 						:href="authUrl"
 					>
 						{{ $t('migrate.getStarted') }}
diff --git a/src/views/namespaces/settings/edit.vue b/src/views/namespaces/settings/edit.vue
index 6c7d0d416..5336c5ef8 100644
--- a/src/views/namespaces/settings/edit.vue
+++ b/src/views/namespaces/settings/edit.vue
@@ -13,7 +13,7 @@
 				<div class="control">
 					<input
 						:class="{ 'disabled': namespaceService.loading}"
-						:disabled="namespaceService.loading || null"
+						:disabled="namespaceService.loading || undefined"
 						class="input"
 						id="namespacetext"
 						:placeholder="$t('namespace.attributes.titlePlaceholder')"
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 178ff4705..468cdef3a 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -10,7 +10,7 @@
 					<div class="control">
 						<input
 							:class="{ disabled: teamMemberService.loading }"
-							:disabled="teamMemberService.loading || null"
+							:disabled="teamMemberService.loading || undefined"
 							class="input"
 							id="teamtext"
 							:placeholder="$t('team.attributes.namePlaceholder')"