diff --git a/packages/storage_client/lib/src/fetch.dart b/packages/storage_client/lib/src/fetch.dart
index 53e6ccbae..3391e7d94 100644
--- a/packages/storage_client/lib/src/fetch.dart
+++ b/packages/storage_client/lib/src/fetch.dart
@@ -34,12 +34,6 @@ class Fetch {
     FetchOptions? options,
   ) {
     if (error is http.Response) {
-      if (options?.noResolveJson == true) {
-        return StorageException(
-          error.body.isEmpty ? error.reasonPhrase ?? '' : error.body,
-          statusCode: '${error.statusCode}',
-        );
-      }
       try {
         final data = json.decode(error.body) as Map<String, dynamic>;
 
@@ -50,7 +44,7 @@ class Fetch {
       } on FormatException catch (_) {
         _log.fine('StorageException for $url', error.body, stack);
         return StorageException(
-          error.body,
+          error.body.isEmpty ? error.reasonPhrase ?? '' : error.body,
           statusCode: '${error.statusCode}',
         );
       }
diff --git a/packages/storage_client/test/client_test.dart b/packages/storage_client/test/client_test.dart
index 7a6eb2799..669ff174b 100644
--- a/packages/storage_client/test/client_test.dart
+++ b/packages/storage_client/test/client_test.dart
@@ -415,7 +415,7 @@ void main() {
         await storage.from('bucket2').download(uploadPath);
         fail('File that does not exist was found');
       } on StorageException catch (error) {
-        expect(error.statusCode, '400');
+        expect(error.statusCode, '404');
       }
       await storage
           .from(newBucketName)
@@ -435,7 +435,7 @@ void main() {
         await storage.from('bucket2').download('$uploadPath 3');
         fail('File that does not exist was found');
       } on StorageException catch (error) {
-        expect(error.statusCode, '400');
+        expect(error.statusCode, '404');
       }
       await storage
           .from(newBucketName)
@@ -449,7 +449,7 @@ void main() {
         await storage.from(newBucketName).download(uploadPath);
         fail('File that was moved was found');
       } on StorageException catch (error) {
-        expect(error.statusCode, '400');
+        expect(error.statusCode, '404');
       }
     });
   });