diff --git a/lib/src/room.dart b/lib/src/room.dart
index f33e667b..ac10e3ad 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -211,7 +211,7 @@ class Room {
   Uri get avatar {
     if (states[EventTypes.RoomAvatar] != null &&
         states[EventTypes.RoomAvatar].content['url'] is String) {
-      return Uri.parse(states[EventTypes.RoomAvatar].content['url']);
+      return Uri.tryParse(states[EventTypes.RoomAvatar].content['url']);
     }
     if (mHeroes != null && mHeroes.length == 1 && states[mHeroes[0]] != null) {
       return states[mHeroes[0]].asUser.avatarUrl;
diff --git a/lib/src/user.dart b/lib/src/user.dart
index f0d2a885..2c7390c9 100644
--- a/lib/src/user.dart
+++ b/lib/src/user.dart
@@ -94,10 +94,10 @@ class User extends Event {
   /// The avatar if the user has one.
   Uri get avatarUrl => content != null && content.containsKey('avatar_url')
       ? (content['avatar_url'] is String
-          ? Uri.parse(content['avatar_url'])
+          ? Uri.tryParse(content['avatar_url'])
           : null)
       : (prevContent != null && prevContent['avatar_url'] is String
-          ? Uri.parse(prevContent['avatar_url'])
+          ? Uri.tryParse(prevContent['avatar_url'])
           : null);
 
   /// Returns the displayname or the local part of the Matrix ID if the user