diff --git a/lib/OpenCloud/Common/Http/Message/Formatter.php b/lib/OpenCloud/Common/Http/Message/Formatter.php
index 1f2b8c2a4..4b7e01b71 100644
--- a/lib/OpenCloud/Common/Http/Message/Formatter.php
+++ b/lib/OpenCloud/Common/Http/Message/Formatter.php
@@ -28,6 +28,9 @@ public static function decode(Response $response)
     {
         if (strpos($response->getHeader(Header::CONTENT_TYPE), Mime::JSON) !== false) {
             $string = (string) $response->getBody();
+            if ('' === $string) {
+                return null;
+            }
             $response = json_decode($string);
             self::checkJsonError($string);