diff --git a/liboverlay/overlayMdp.cpp b/liboverlay/overlayMdp.cpp
index 6fd1eb8..c795b99 100644
--- a/liboverlay/overlayMdp.cpp
+++ b/liboverlay/overlayMdp.cpp
@@ -43,17 +43,21 @@
 }
 
 bool MdpCtrl::close() {
-    if(MSMFB_NEW_REQUEST == static_cast<int>(mOVInfo.id))
-        return true;
-    if(!mdp_wrapper::unsetOverlay(mFd.getFD(), mOVInfo.id)) {
-        ALOGE("MdpCtrl close error in unset");
-        return false;
+    bool result = true;
+
+    if(MSMFB_NEW_REQUEST != static_cast<int>(mOVInfo.id)) {
+        if(!mdp_wrapper::unsetOverlay(mFd.getFD(), mOVInfo.id)) {
+            ALOGE("MdpCtrl close error in unset");
+            result = false;
+        }
     }
+
     reset();
     if(!mFd.close()) {
-        return false;
+        result = false;
     }
-    return true;
+
+    return result;
 }
 
 bool MdpCtrl::setSource(const utils::PipeArgs& args) {
diff --git a/liboverlay/overlayMdp.h b/liboverlay/overlayMdp.h
index 1ccd64b..695657b 100644
--- a/liboverlay/overlayMdp.h
+++ b/liboverlay/overlayMdp.h
@@ -463,12 +463,8 @@
 }
 
 inline bool MdpData::close() {
-    if(-1 == mOvData.data.memory_id) return true;
     reset();
-    if(!mFd.close()) {
-        return false;
-    }
-    return true;
+    return mFd.close();
 }
 
 inline int MdpData::getSrcMemoryId() const { return mOvData.data.memory_id; }