diff --git a/assets/components/alerts/add.vue b/assets/components/alerts/add.vue
index 45d3aa72d..b45059776 100755
--- a/assets/components/alerts/add.vue
+++ b/assets/components/alerts/add.vue
@@ -189,7 +189,7 @@
 						</li>
 
 						<Tooltip
-							v-if="!entity"
+							v-if="entities.length === 0"
 							@open="$refs.expression?.focus()"
 						>
 							<li class="match placeholder">
@@ -283,7 +283,7 @@
 
 			<div class="dialog-actions right">
 				<button
-					:disabled="actors.length === 0 && tags.length === 0 && !entity && matches.length === 0"
+					:disabled="actors.length === 0 && tags.length === 0 && entities.length === 0 && matches.length === 0"
 					type="submit"
 					class="button button-primary"
 				>Add alert</button>