diff --git a/core/src/core/src/pydio/Core/Utils/Crypto/ZeroPaddingRijndael.php b/core/src/core/src/pydio/Core/Utils/Crypto/ZeroPaddingRijndael.php
index cdf49059cd..4889e7c33e 100644
--- a/core/src/core/src/pydio/Core/Utils/Crypto/ZeroPaddingRijndael.php
+++ b/core/src/core/src/pydio/Core/Utils/Crypto/ZeroPaddingRijndael.php
@@ -74,10 +74,6 @@ function _pad($text)
      * @return string
      */
     function _unpad($text)   {
-        $trimed = trim($text, "\0");
-        while($text === $trimed){
-            $trimed = trim($text, "\0");
-        }
-        return $trimed;
+        return trim($text, "\0");
     }
 }