diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 3d9a7e0..ac384fd 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -670,6 +670,7 @@
                     break;
             }
         }
+        updateStatusHints();
         updateConnectionCapabilities();
         updateAddress();
         updateMultiparty();
@@ -869,10 +870,9 @@
     }
 
     private void updateStatusHints() {
-        if (mIsWifi && mOriginalConnection != null &&
-                (mOriginalConnection.getState() == Call.State.INCOMING
-                        || mOriginalConnection.getState() == Call.State.ACTIVE)) {
-            int labelId = mOriginalConnection.getState() == Call.State.INCOMING
+        boolean isIncoming = isValidRingingCall();
+        if (mIsWifi && (isIncoming || getState() == STATE_ACTIVE)) {
+            int labelId = isIncoming
                     ? R.string.status_hint_label_incoming_wifi_call
                     : R.string.status_hint_label_wifi_call;