diff --git a/src/com/android/phone/CallModeler.java b/src/com/android/phone/CallModeler.java
index 52a7ef8..ae0ac48 100644
--- a/src/com/android/phone/CallModeler.java
+++ b/src/com/android/phone/CallModeler.java
@@ -145,12 +145,7 @@
 
         for (Entry<Connection, Call> entry : mConfCallMap.entrySet()) {
             if (entry.getValue().getCallId() == callId) {
-                if (entry.getValue().getChildCallIds().size() == 0) {
-                    return null;
-                }
-                final CallResult child = getCallWithId(entry.getValue().getChildCallIds().first());
-                return new CallResult(entry.getValue(), child.getActionableCall(),
-                        child.getConnection());
+                return new CallResult(entry.getValue(), entry.getKey());
             }
         }
         return null;
