diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 16f6476f7..dd965e29c 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -260,6 +260,9 @@ export default {
 			}
 		},
 		setFilter() {
+			if (this.filter.users.length > 0) {
+				this.filter.unassigned = false
+			}
 			this.$nextTick(() => this.$store.dispatch('setFilter', { ...this.filter }))
 		},
 		toggleNav() {
diff --git a/src/store/card.js b/src/store/card.js
index ae5520d6a..1c3aef8e4 100644
--- a/src/store/card.js
+++ b/src/store/card.js
@@ -35,7 +35,6 @@ export default {
 				const { tags, users, due, unassigned } = rootState.filter
 				let allTagsMatch = true
 				let allUsersMatch = true
-				let allUnassigned = true
 
 				if (tags.length > 0) {
 					tags.forEach((tag) => {
@@ -59,14 +58,8 @@ export default {
 					}
 				}
 
-				if (unassigned) {
-					if (card.assignedUsers.length > 0) {
-						allUnassigned = false
-					}
-
-					if (!allUnassigned) {
-						return false
-					}
+				if (unassigned && card.assignedUsers.length > 0) {
+					return false
 				}
 
 				if (due !== '') {