diff --git a/lib/pangea/public_spaces/public_room_bottom_sheet.dart b/lib/pangea/public_spaces/public_room_bottom_sheet.dart
index 1c27a17e2..d7fcdecc0 100644
--- a/lib/pangea/public_spaces/public_room_bottom_sheet.dart
+++ b/lib/pangea/public_spaces/public_room_bottom_sheet.dart
@@ -2,6 +2,7 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -199,17 +200,25 @@ class PublicRoomBottomSheetState extends State<PublicRoomBottomSheet> {
                   Row(
                     spacing: 16.0,
                     children: [
-                      Avatar(
-                        mxContent: chunk?.avatarUrl ??
-                            Uri.parse(
-                              SpaceConstants.publicSpaceIcons[Random().nextInt(
-                                SpaceConstants.publicSpaceIcons.length,
-                              )],
+                      (chunk?.avatarUrl != null)
+                          ? Avatar(
+                              mxContent: chunk?.avatarUrl,
+                              name: chunk?.name,
+                              size: 160.0,
+                              borderRadius: BorderRadius.circular(24.0),
+                            )
+                          : ClipRRect(
+                              borderRadius: BorderRadius.circular(24.0),
+                              child: CachedNetworkImage(
+                                imageUrl: SpaceConstants
+                                    .publicSpaceIcons[Random().nextInt(
+                                  SpaceConstants.publicSpaceIcons.length,
+                                )],
+                                width: 160.0,
+                                height: 160.0,
+                                fit: BoxFit.cover,
+                              ),
                             ),
-                        name: chunk?.name,
-                        size: 160.0,
-                        borderRadius: BorderRadius.circular(24.0),
-                      ),
                       Expanded(
                         child: SizedBox(
                           height: 160.0,
diff --git a/lib/pangea/public_spaces/public_space_card.dart b/lib/pangea/public_spaces/public_space_card.dart
index a27e99692..3f2a22036 100644
--- a/lib/pangea/public_spaces/public_space_card.dart
+++ b/lib/pangea/public_spaces/public_space_card.dart
@@ -2,6 +2,7 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 
@@ -62,17 +63,22 @@ class PublicSpaceCard extends StatelessWidget {
                   ),
                   child: ClipRRect(
                     borderRadius: BorderRadius.circular(24.0),
-                    child: MxcImage(
-                      uri: space.avatarUrl ??
-                          Uri.parse(
-                            SpaceConstants.publicSpaceIcons[Random().nextInt(
+                    child: space.avatarUrl != null
+                        ? MxcImage(
+                            uri: space.avatarUrl!,
+                            width: width,
+                            height: width,
+                            fit: BoxFit.cover,
+                          )
+                        : CachedNetworkImage(
+                            imageUrl: SpaceConstants
+                                .publicSpaceIcons[Random().nextInt(
                               SpaceConstants.publicSpaceIcons.length,
                             )],
+                            width: width,
+                            height: width,
+                            fit: BoxFit.cover,
                           ),
-                      width: width,
-                      height: width,
-                      fit: BoxFit.cover,
-                    ),
                   ),
                 ),
                 Expanded(