diff --git a/src/components/core/CoreHandlers.cpp b/src/components/core/CoreHandlers.cpp
index b33186981..972b4cff0 100644
--- a/src/components/core/CoreHandlers.cpp
+++ b/src/components/core/CoreHandlers.cpp
@@ -102,7 +102,13 @@ void CoreHandlers::onCallStateChanged (
 ) {
   emit callStateChanged(call, state);
 
-  if (call->getState() == linphone::CallStateIncomingReceived)
+  SettingsModel *settingsModel = CoreManager::getInstance()->getSettingsModel();
+  if (
+    call->getState() == linphone::CallStateIncomingReceived && (
+      !settingsModel->getAutoAnswerStatus() ||
+      settingsModel->getAutoAnswerDelay() > 0
+    )
+  )
     App::getInstance()->getNotifier()->notifyReceivedCall(call);
 }