diff --git a/core/AmSipDialog.cpp b/core/AmSipDialog.cpp
index c868f19f..c50c0193 100644
--- a/core/AmSipDialog.cpp
+++ b/core/AmSipDialog.cpp
@@ -346,12 +346,12 @@ void AmSipDialog::updateStatus(const AmSipReply& reply)
       if (reply.code < 200)
 	break;
 
-      if(reply.code == 487){
+      if(reply.code >= 400){
 	// CANCEL accepted
 	DBG("CANCEL accepted, status -> Disconnected\n");
 	status = Disconnected;
       }
-      else {
+      else if(reply.code < 300){
 	// CANCEL rejected
 	DBG("CANCEL rejected/too late - bye()\n");
 	bye();