diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index 38049f0d92f..69387da7356 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -123,6 +123,7 @@
 					<template v-if="!isSearching">
 						<NcAppNavigationCaption v-if="isFiltered && filteredConversationsList.length > 0" :name="getFilterCaption" />
 						<NcEmptyContent v-else-if="initialisedConversations && filteredConversationsList.length === 0"
+							class="scroller"
 							:name="t('spreed', 'No matches found')"
 							:description="messageDisplay">
 							<template #icon>
@@ -144,9 +145,6 @@
 								class="scroller h-100"
 								@scroll.native="debounceHandleScroll" />
 						</li>
-						<Hint v-if="initialisedConversations && filteredConversationsList.length === 0"
-							:hint="t('spreed', 'No matches found')" />
-
 						<NcButton v-if="!preventFindingUnread && lastUnreadMentionBelowViewportIndex !== null"
 							class="unread-mention-button"
 							type="primary"
@@ -385,6 +383,7 @@ export default {
 			isCurrentTabLeader: false,
 			isFocused: false,
 			isFiltered: null,
+			previousFilter: null,
 		}
 	},
 
@@ -427,19 +426,17 @@ export default {
 			}
 			// applying filters
 			if (this.isFiltered) {
-				const filteredConversations = this.conversationsList.filter(function(conversation) {
-					return this.filterFunction(conversation)
-								|| conversation.hasCall
-								|| conversation.token === this.token
-				}.bind(this))
+				const filteredConversations = this.conversationsList.filter((conversation) => this.filterFunction(conversation)
+					|| conversation.hasCall
+					|| conversation.token === this.token)
 
 				// return empty if it only includes the current conversation without any flags
-				const includesCurrentConversationOnly = filteredConversations.length === 1
-					&& filteredConversations.filter(function(conversation) {
-						return !this.filterFunction(conversation) && conversation.token === this.token
-					}.bind(this)).length
+				const isNewFilter = this.isPreviousFilter() !== this.isFiltered
+				const hasCurrentConversationOnly = filteredConversations.length === 1
+					&& filteredConversations.filter((conversation) => !this.filterFunction(conversation)
+						&& conversation.token === this.token).length
 
-				return includesCurrentConversationOnly ? [] : filteredConversations
+				return hasCurrentConversationOnly && isNewFilter ? [] : filteredConversations
 			}
 
 			return this.conversationsList
@@ -561,18 +558,24 @@ export default {
 			this.$refs.openConversationsList.showModal()
 		},
 
+		isPreviousFilter() {
+			const cachedPreviousFilter = this.previousFilter
+			this.previousFilter = this.isFiltered
+			return cachedPreviousFilter
+		},
+
 		handleFilter(filter) {
 			this.isFiltered = filter
-
 			// Store the active filter
 			if (filter) {
 				BrowserStorage.setItem('filterEnabled', filter)
 			} else {
 				BrowserStorage.removeItem('filterEnabled')
 			}
-
 			// Clear the search input once a filter is active
 			this.searchText = ''
+			// Initiate the previous filter
+			this.previousFilter = null
 		},
 
 		filterFunction(conversation) {
diff --git a/src/utils/conversation.js b/src/utils/conversation.js
index 9911b225e69..8a98439da81 100644
--- a/src/utils/conversation.js
+++ b/src/utils/conversation.js
@@ -1,5 +1,5 @@
 /**
- * @copyright Copyright (c) 2023
+ * @copyright Copyright (c) 2023 <dorra.jaoued7@gmail.com>
  *
  * @author Dorra Jaouad <dorra.jaoued7@gmail.com>
  *
@@ -19,9 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import {
-	CONVERSATION,
-} from '../constants.js'
+import { CONVERSATION } from '../constants.js'
 
 /**
  * check if the conversation has unread messages