diff --git a/core/src/views/UnifiedSearchModal.vue b/core/src/views/UnifiedSearchModal.vue
index 7ee56ecb3bbd0..0d85ed491f637 100644
--- a/core/src/views/UnifiedSearchModal.vue
+++ b/core/src/views/UnifiedSearchModal.vue
@@ -27,6 +27,7 @@
 						provider.id concatenated to provider.name is used to create the item id, if same then, there should be an issue. -->
 						<NcActionButton v-for="provider in providers"
 							:key="`${provider.id}-${provider.name.replace(/\s/g, '')}`"
+							:disabled="provider.disabled"
 							@click="addProviderFilter(provider)">
 							<template #icon>
 								<img :src="provider.icon" class="filter-button__icon" alt="">
@@ -299,22 +300,18 @@ export default {
 					extraQueries: provider.extraParams,
 				}
 
+				// This block of filter checks should be dynamic somehow and should be handled in
+				// nextcloud/search lib
 				if (filters.dateFilterIsApplied) {
 					if (provider.filters.since && provider.filters.until) {
 						params.since = this.dateFilter.startFrom
 						params.until = this.dateFilter.endAt
-					} else {
-						// Date filter is applied but provider does not support it, no need to search provider
-						return
 					}
 				}
 
 				if (filters.personFilterIsApplied) {
 					if (provider.filters.person) {
 						params.person = this.personFilter.user
-					} else {
-						// Person filter is applied but provider does not support it, no need to search provider
-						return
 					}
 				}
 
@@ -415,6 +412,10 @@ export default {
 				this.filters[existingPersonFilter].name = person.displayName
 			}
 
+			this.providers.forEach(async (provider, index) => {
+				this.providers[index].disabled = !(await this.providerIsCompatibleWithFilters(provider, ['person']))
+			})
+
 			this.debouncedFind(this.searchQuery)
 			console.debug('Person filter applied', person)
 		},
@@ -471,6 +472,7 @@ export default {
 						if (filter.type === 'person') {
 							this.personFilterIsApplied = false
 						}
+						this.enableAllProviders()
 						break
 					}
 				}
@@ -509,6 +511,9 @@ export default {
 				this.filters.push(this.dateFilter)
 			}
 			this.dateFilterIsApplied = true
+			this.providers.forEach(async (provider, index) => {
+				this.providers[index].disabled = !(await this.providerIsCompatibleWithFilters(provider, ['since', 'until']))
+			})
 			this.debouncedFind(this.searchQuery)
 		},
 		applyQuickDateRange(range) {
@@ -599,6 +604,14 @@ export default {
 
 			return flattenedArray
 		},
+		async providerIsCompatibleWithFilters(provider, filterIds) {
+			return filterIds.every(filterId => provider.filters?.[filterId] !== undefined)
+		},
+		async enableAllProviders() {
+			this.providers.forEach(async (_, index) => {
+				this.providers[index].disabled = false
+			})
+		},
 		focusInput() {
 			this.$refs.searchInput.$el.children[0].children[0].focus()
 		},