diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 7b0fa11..1f97db4 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -169,10 +169,6 @@
                 ctx->mExtDispConfiguring = false;
                 setListStats(ctx, list, dpy);
                 int fbZOrder = ctx->mMDPComp[dpy]->prepare(ctx, list);
-                if(ctx->deviceOrientation &&
-                    ctx->listStats[dpy].isDisplayAnimating) {
-                    fbZOrder = 0;
-                }
                 if(fbZOrder >= 0)
                     ctx->mFBUpdate[dpy]->prepare(ctx, list, fbZOrder);
 
diff --git a/libhwcomposer/hwc_fbupdate.cpp b/libhwcomposer/hwc_fbupdate.cpp
index 2ec6019..7fb5b46 100644
--- a/libhwcomposer/hwc_fbupdate.cpp
+++ b/libhwcomposer/hwc_fbupdate.cpp
@@ -95,9 +95,13 @@
                 __FUNCTION__, mDpy);
             return false;
         }
-
         mDest = dest;
 
+        if((mDpy && ctx->deviceOrientation) &&
+            ctx->listStats[mDpy].isDisplayAnimating) {
+            fbZorder = 0;
+        }
+
         ovutils::eMdpFlags mdpFlags = ovutils::OV_MDP_BLEND_FG_PREMULT;
         ovutils::eIsFg isFg = ovutils::IS_FG_OFF;
         ovutils::eZorder zOrder = static_cast<ovutils::eZorder>(fbZorder);