diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 4baf986e..20ac9a57 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -123,11 +123,11 @@ static int hwc_prepare_primary(hwc_composer_device_1 *dev,
         hwc_layer_1_t *fbLayer = &list->hwLayers[last];
         if(fbLayer->handle) {
             setListStats(ctx, list, HWC_DISPLAY_PRIMARY);
-            ctx->mLayerCache->updateLayerCache(list);
             reset_layer_prop(ctx, HWC_DISPLAY_PRIMARY);
             if(!MDPComp::configure(ctx, list)) {
                 VideoOverlay::prepare(ctx, list, HWC_DISPLAY_PRIMARY);
                 FBUpdate::prepare(ctx, fbLayer, HWC_DISPLAY_PRIMARY);
+                ctx->mLayerCache->updateLayerCache(list);
             }
         }
     }
diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index fcbbc287..2056859d 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -264,6 +264,9 @@ bool MDPComp::isDoable(hwc_context_t *ctx, hwc_display_contents_1_t* list) {
         return false;
     }
 
+    if(ctx->mSecureMode)
+        return false;
+
     //Check for skip layers
     if(isSkipPresent(ctx)) {
         ALOGD_IF(isDebug(), "%s: Skip layers are present",__FUNCTION__);