diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index d5b36da..9cb7d5f 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4243,7 +4243,10 @@
                     // Do not allow deletion if the file/object is referenced as parent
                     // by some other entries. It could cause database corruption.
                     if (!TextUtils.isEmpty(sGetTableAndWhereParam.where)) {
-                        sGetTableAndWhereParam.where += " AND (" + ID_NOT_PARENT_CLAUSE + ")";
+                        sGetTableAndWhereParam.where =
+                                "(" + sGetTableAndWhereParam.where + ")" +
+                                        " AND (_id NOT IN (SELECT parent FROM files" +
+                                        " WHERE NOT (" + sGetTableAndWhereParam.where + ")))";
                     } else {
                         sGetTableAndWhereParam.where = ID_NOT_PARENT_CLAUSE;
                     }