diff --git a/lib/just_audio.dart b/lib/just_audio.dart
index c6733e4..5e96709 100644
--- a/lib/just_audio.dart
+++ b/lib/just_audio.dart
@@ -868,7 +868,12 @@ class IcyMetadata {
   IcyMetadata({@required this.info, @required this.headers});
 
   IcyMetadata.fromJson(Map json)
-      : this(info: json['info'], headers: json['headers']);
+      : this(
+          info: json['info'] == null ? null : IcyInfo.fromJson(json['info']),
+          headers: json['headers'] == null
+              ? null
+              : IcyHeaders.fromJson(json['headers']),
+        );
 
   @override
   int get hashCode => info.hashCode ^ headers.hashCode;