diff --git a/CHANGES.md b/CHANGES.md
index 0af92bf211..1ffa3c7ebe 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ Other changes:
  -
 
 Bugfix 🐛:
- -
+ - Fix crash by removing all notifications after clearing cache (#878)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
index c714be7650..bc5a1aff95 100644
--- a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
@@ -85,7 +85,7 @@ class MainActivity : VectorBaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         args = parseArgs()
-        if (args.clearCredentials || args.isUserLoggedOut) {
+        if (args.clearCredentials || args.isUserLoggedOut || args.clearCache) {
             clearNotifications()
         }
         // Handle some wanted cleanup