diff --git a/lib/pages/chat/events/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart
index c433d155f..89823f783 100644
--- a/lib/pages/chat/events/image_bubble.dart
+++ b/lib/pages/chat/events/image_bubble.dart
@@ -20,7 +20,6 @@ class ImageBubble extends StatefulWidget {
   final BoxFit fit;
   final bool maxSize;
   final Color backgroundColor;
-  final double radius;
   final bool thumbnailOnly;
   final bool animated;
   final double width;
@@ -34,7 +33,6 @@ class ImageBubble extends StatefulWidget {
     this.maxSize = true,
     this.backgroundColor,
     this.fit = BoxFit.cover,
-    this.radius = 10.0,
     this.thumbnailOnly = true,
     this.onLoaded,
     this.width = 400,
@@ -406,24 +404,21 @@ class _ImageBubbleState extends State<ImageBubble> {
         child: content,
       );
     }
-    return ClipRRect(
-      borderRadius: BorderRadius.circular(widget.radius),
-      child: InkWell(
-        onTap: () => onTap(context),
-        child: Hero(
-          tag: widget.event.eventId,
-          child: AnimatedSwitcher(
-            duration: const Duration(milliseconds: 1000),
-            child: Container(
-              key: ValueKey(key),
-              constraints: widget.maxSize
-                  ? BoxConstraints.loose(Size(
-                      widget.width,
-                      widget.height,
-                    ))
-                  : null,
-              child: content,
-            ),
+    return InkWell(
+      onTap: () => onTap(context),
+      child: Hero(
+        tag: widget.event.eventId,
+        child: AnimatedSwitcher(
+          duration: const Duration(milliseconds: 1000),
+          child: Container(
+            key: ValueKey(key),
+            constraints: widget.maxSize
+                ? BoxConstraints.loose(Size(
+                    widget.width,
+                    widget.height,
+                  ))
+                : null,
+            child: content,
           ),
         ),
       ),
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 91b39619d..328be5e60 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -247,6 +247,7 @@ class Message extends StatelessWidget {
                   child: Material(
                 color: Theme.of(context).backgroundColor,
                 borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
+                clipBehavior: Clip.antiAlias,
                 child: Padding(
                   padding: const EdgeInsets.all(6.0),
                   child: Text(
diff --git a/lib/pages/image_viewer/image_viewer_view.dart b/lib/pages/image_viewer/image_viewer_view.dart
index 9d42842f8..a2cb9609b 100644
--- a/lib/pages/image_viewer/image_viewer_view.dart
+++ b/lib/pages/image_viewer/image_viewer_view.dart
@@ -51,7 +51,6 @@ class ImageViewerView extends StatelessWidget {
             fit: BoxFit.contain,
             backgroundColor: Colors.black,
             maxSize: false,
-            radius: 0.0,
             thumbnailOnly: false,
             animated: true,
           ),