diff --git a/app/src/main/java/com/infomaniak/mail/MainApplication.kt b/app/src/main/java/com/infomaniak/mail/MainApplication.kt
index 7c941660ad..284917e385 100644
--- a/app/src/main/java/com/infomaniak/mail/MainApplication.kt
+++ b/app/src/main/java/com/infomaniak/mail/MainApplication.kt
@@ -179,6 +179,7 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
                 shouldLog.add(isSentryTrackingEnabled)
 
                 // Network exceptions are discarded
+                // TODO: It doesn't work anymore :(
                 val isNetworkException = event.exceptions?.any { it.type == "ApiController\$NetworkException" } ?: false
                 shouldLog.add(!isNetworkException)
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt
index 4838bdf36b..919ac9e5ba 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt
@@ -42,9 +42,7 @@ object MyKSuiteDataUtils : MyKSuiteDataManager() {
         } else {
             @OptIn(ExperimentalSerializationApi::class)
             apiResponse.error?.exception?.let {
-                if (it is MissingFieldException || it.message?.contains("Unexpected JSON token") == true) {
-                    SentryLog.e(TAG, "Error decoding the api result MyKSuiteObject", it)
-                }
+                if (it is MissingFieldException) SentryLog.e(TAG, "Error decoding the api result MyKSuiteObject", it)
             }
         }
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SharedUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SharedUtils.kt
index 733b2fbaff..4da6f0ce5f 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SharedUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SharedUtils.kt
@@ -18,6 +18,7 @@
 package com.infomaniak.mail.utils
 
 import androidx.fragment.app.Fragment
+import com.infomaniak.lib.core.api.ApiController
 import com.infomaniak.mail.MatomoMail.trackEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
@@ -184,7 +185,9 @@ class SharedUtils @Inject constructor(
                     null
                 } else {
                     val apiException = getApiException()
-                    Sentry.captureException(SignatureException(apiException.message, apiException))
+                    if (apiException !is ApiController.NetworkException) {
+                        Sentry.captureException(SignatureException(apiException.message, apiException))
+                    }
                     translatedError
                 }
             }