lib/widgets/avatar_or_hash.dart

@@ -30,7 +30,6 @@ class AvatarOrHash extends ConsumerWidget {
       color: ColorHash(title).color,
       child: Center(child: Text(title.isEmpty ? "" : title[0])),
     );
-
     final parsedAvatar = avatar?.mxcToHttps(
       ref.watch(
             ClientStateController.provider.select(
@@ -39,7 +38,6 @@ class AvatarOrHash extends ConsumerWidget {
           ) ??
           "",
     );
-
     return SizedBox(
       width: height,
       height: height,
@@ -64,8 +62,8 @@ class AvatarOrHash extends ConsumerWidget {
                       ),
                       fit: .cover,
                       loadingBuilder: (_, child, loadingProgress) =>
-                          loadingProgress == null ? child : fallback ?? box,
+                          loadingProgress == null ? child : box,
-                      errorBuilder: (_, _, _) => fallback ?? box,
+                      errorBuilder: (_, _, _) => box,
                     ),
             ),
           ),

lib/widgets/expandable_image.dart

@@ -21,12 +21,9 @@ class ExpandableImage extends ConsumerWidget {
               builder: (context, constraints) => Dialog(
                 backgroundColor: Colors.transparent,
                 insetPadding: .all(constraints.maxWidth / 100),
-                child: InteractiveViewer(
-                  maxScale: 5,
                 child: ConstrainedBox(
-                    constraints: .new(
+                  constraints: .new(minWidth: min(constraints.maxWidth, 1000)),
-                      minWidth: min(constraints.maxWidth, 1000),
+                  child: InteractiveViewer(
-                    ),
                     child: Image(
                       fit: .contain,
                       errorBuilder: (_, error, stackTrace) => ErrorDialog(