diff --git a/kernel/classes/clusterfilehandlers/ezdbfilehandler.php b/kernel/classes/clusterfilehandlers/ezdbfilehandler.php
index db382aa488da63bc59f6289dbdf76adabcebb429..e40fbb2d2302bf101f6660d758f56e2ba2b717d0 100644
--- a/kernel/classes/clusterfilehandlers/ezdbfilehandler.php
+++ b/kernel/classes/clusterfilehandlers/ezdbfilehandler.php
@@ -947,11 +947,11 @@ class eZDBFileHandler
 
         if ( $fnamePart === false )
             $this->backend->_delete( $path );
-        if ( $fnamePart !== false )
-            $pattern = $path . '/' . $fnamePart . '%';
         else
-            $pattern = $path . '/%';
-        $this->backend->_deleteByLike( $pattern );
+        {
+            $pattern = $path . '/' . $fnamePart . '%';
+            $this->backend->_deleteByLike( $pattern );
+        }
     }
 
     /**
@@ -968,7 +968,6 @@ class eZDBFileHandler
         eZDebugSetting::writeDebug( 'kernel-clustering', "db::delete( '$path' )" );
 
         $this->backend->_delete( $path );
-        $this->backend->_deleteByLike( $path . '/%' );
 
         $this->metaData = null;
     }