diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index 8039e2480..257a6ea12 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -572,6 +572,10 @@ class ConversationsListActivity :
             AGE_THRESHOLD_FOR_EVENT_CONVERSATIONS
     }
 
+    fun showOnlyNearFutureEvents() {
+        adapter?.updateDataSet(nearFutureEventConversationItems, false)
+    }
+
     private fun addToNearFutureEventConversationItems(conversation: ConversationModel) {
         val conversationItem = ConversationItem(conversation, currentUser!!, this, null, viewThemeUtils)
         nearFutureEventConversationItems.add(conversationItem)
diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt
index 68b70c916..af8089edf 100644
--- a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt
+++ b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt
@@ -55,7 +55,7 @@ object Migrations {
         }
     }
 
-    val MIGRATION_13_14 = object:Migration(13,14) {
+    val MIGRATION_13_14 = object : Migration(13, 14) {
         override fun migrate(db: SupportSQLiteDatabase) {
             Log.i("Migrations", "Migrating 13 to 14")
             addObjectId(db)
@@ -272,9 +272,7 @@ object Migrations {
         }
     }
 
-
     fun addObjectId(db: SupportSQLiteDatabase) {
-
         try {
             db.execSQL(
                 "ALTER TABLE Conversations " +
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
index d78f3d2e8..80346beba 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
@@ -7,6 +7,7 @@
 package com.nextcloud.talk.ui.dialog
 
 import android.app.Dialog
+import android.content.DialogInterface
 import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -99,6 +100,10 @@ class FilterConversationFragment : DialogFragment() {
         }
 
         binding.buttonClose.setOnClickListener {
+            val noFiltersActive = !(filterState[MENTION] == true || filterState[UNREAD] == true || filterState[ARCHIVE] == true)
+            if (noFiltersActive) {
+                (requireActivity() as ConversationsListActivity).showOnlyNearFutureEvents()
+            }
             dismiss()
         }
     }
@@ -130,6 +135,14 @@ class FilterConversationFragment : DialogFragment() {
         (requireActivity() as ConversationsListActivity).filterConversation()
     }
 
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        val noFiltersActive = !(filterState[MENTION] == true || filterState[UNREAD] == true || filterState[ARCHIVE] == true)
+        if (noFiltersActive) {
+            (requireActivity() as ConversationsListActivity).showOnlyNearFutureEvents()
+        }
+    }
+
     companion object {
         private const val FILTER_STATE_ARG = "FILTER_STATE_ARG"