diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK b/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
index 1680f79c5..3687f0355 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
@@ -5,6 +5,7 @@ android_library(
   srcs = glob(['*.java']),
   deps = [
     YOGA_TARGET,
+    react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),
@@ -32,4 +33,3 @@ android_library(
     'PUBLIC',
   ],
 )
-
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
index 979166bd5..0008ee69e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
@@ -12,6 +12,7 @@ package com.facebook.react.flat;
 import javax.annotation.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -20,6 +21,7 @@ import android.util.SparseIntArray;
 import android.view.View;
 import android.view.animation.Animation;
 
+import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
@@ -144,6 +146,9 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
  * loosely sorted as well when clipping.
  */
 /* package */ abstract class ClippingDrawCommandManager extends DrawCommandManager {
+
+  private static final String TAG = ClippingDrawCommandManager.class.getSimpleName();
+
   private final FlatViewGroup mFlatViewGroup;
   private DrawCommand[] mDrawCommands = DrawCommand.EMPTY_ARRAY;
   protected float[] mCommandMaxBottom = StateBuilder.EMPTY_FLOAT_ARRAY;
@@ -616,7 +621,17 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
     // If we get here, it means we have drawn all the views, now just draw the remaining draw
     // commands.
     while (commandIndex < mStop) {
-      mDrawCommands[commandIndex++].draw(mFlatViewGroup, canvas);
+      DrawCommand command = mDrawCommands[commandIndex++];
+      if (command instanceof DrawView) {
+        // We should never have more DrawView commands at this point. But in case we do, fail safely
+        // by ignoring the DrawView command
+        FLog.w(
+            TAG,
+            "Unexpected DrawView command at index " + (commandIndex-1) + " with mStop=" +
+              mStop + ". " + Arrays.toString(mDrawCommands));
+        continue;
+      }
+      command.draw(mFlatViewGroup, canvas);
     }
   }