diff --git a/src/calls-ui-call-data.c b/src/calls-ui-call-data.c
index fb36fef..f5d3151 100644
--- a/src/calls-ui-call-data.c
+++ b/src/calls-ui-call-data.c
@@ -72,11 +72,11 @@ calls_state_to_cui_call_state (CallsCallState state)
   case CALLS_CALL_STATE_DIALING:
     return CUI_CALL_STATE_DIALING;
   case CALLS_CALL_STATE_ALERTING:
-    return CUI_CALL_STATE_ALERTING;
+    return CUI_CALL_STATE_DIALING;
   case CALLS_CALL_STATE_INCOMING:
     return CUI_CALL_STATE_INCOMING;
   case CALLS_CALL_STATE_WAITING:
-    return CUI_CALL_STATE_WAITING;
+    return CUI_CALL_STATE_INCOMING;
   case CALLS_CALL_STATE_DISCONNECTED:
     return CUI_CALL_STATE_DISCONNECTED;
   default: