diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index 82adfc3..3ecf1b3 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -1501,6 +1501,8 @@
                     }
                 }
             }
+        } else if (!mCallGroup.isReferrer(ImsCall.this)) {
+            return;
         }
 
         listener = mListener;
@@ -1675,9 +1677,6 @@
                 return;
             }
 
-            // If this condition is satisfied, this call is either a part of
-            // a conference call or a call that is about to be merged into an
-            // existing conference call.
             if (mCallGroup != null) {
                 notifyConferenceSessionTerminated(reasonInfo);
             } else {
@@ -1941,8 +1940,9 @@
 
         @Override
         public void callSessionTerminated(ImsCallSession session, ImsReasonInfo reasonInfo) {
-            if (mSession != session) {
-                log("callSessionTerminated :: not supported for conference session=" + session);
+            if (isTransientConferenceSession(session)) {
+                log("callSessionTerminated :: not supported for transient conference session=" +
+                        session);
                 return;
             }
 
