diff --git a/media/java/android/media/videoeditor/VideoEditorTestImpl.java b/media/java/android/media/videoeditor/VideoEditorTestImpl.java
index f4842b5289021..60395695a9d02 100644
--- a/media/java/android/media/videoeditor/VideoEditorTestImpl.java
+++ b/media/java/android/media/videoeditor/VideoEditorTestImpl.java
@@ -1155,12 +1155,14 @@ public class VideoEditorTestImpl implements VideoEditor {
     private void removeAdjacentTransitions(MediaItem mediaItem) {
         final Transition beginTransition = mediaItem.getBeginTransition();
         if (beginTransition != null) {
+            beginTransition.getAfterMediaItem().setEndTransition(null);
             beginTransition.invalidate();
             mTransitions.remove(beginTransition);
         }
 
         final Transition endTransition = mediaItem.getEndTransition();
         if (endTransition != null) {
+            endTransition.getBeforeMediaItem().setBeginTransition(null);
             endTransition.invalidate();
             mTransitions.remove(endTransition);
         }