diff --git a/Session/Conversations/Message Cells/Content Views/MediaAlbumView.swift b/Session/Conversations/Message Cells/Content Views/MediaAlbumView.swift
index 9835f9920..a4cdf7e67 100644
--- a/Session/Conversations/Message Cells/Content Views/MediaAlbumView.swift	
+++ b/Session/Conversations/Message Cells/Content Views/MediaAlbumView.swift	
@@ -28,7 +28,8 @@ public class MediaAlbumView: UIStackView {
                 MediaView(
                     mediaCache: mediaCache,
                     attachment: $0,
-                    isOutgoing: isOutgoing
+                    isOutgoing: isOutgoing,
+                    cornerRadius: VisibleMessageCell.largeCornerRadius
                 )
             }
 
diff --git a/Session/Conversations/Message Cells/Content Views/MediaView.swift b/Session/Conversations/Message Cells/Content Views/MediaView.swift
index 214c22f1d..507b72917 100644
--- a/Session/Conversations/Message Cells/Content Views/MediaView.swift	
+++ b/Session/Conversations/Message Cells/Content Views/MediaView.swift	
@@ -47,7 +47,8 @@ public class MediaView: UIView {
     public required init(
         mediaCache: NSCache<NSString, AnyObject>? = nil,
         attachment: Attachment,
-        isOutgoing: Bool
+        isOutgoing: Bool,
+        cornerRadius: CGFloat
     ) {
         self.mediaCache = mediaCache
         self.attachment = attachment
@@ -58,7 +59,7 @@ public class MediaView: UIView {
         themeBackgroundColor = .backgroundSecondary
         clipsToBounds = true
         layer.masksToBounds = true
-        layer.cornerRadius = VisibleMessageCell.largeCornerRadius
+        layer.cornerRadius = cornerRadius
 
         createContents()
     }
diff --git a/Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift b/Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift
index 3bac68e67..f30e5d8a9 100644
--- a/Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift	
+++ b/Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift	
@@ -16,7 +16,8 @@ extension MediaInfoVC {
         private lazy var mediaView: MediaView = {
             let result: MediaView = MediaView.init(
                 attachment: attachment,
-                isOutgoing: isOutgoing
+                isOutgoing: isOutgoing,
+                cornerRadius: 0
             )
             
             return result
diff --git a/Session/Media Viewing & Editing/MediaInfoVC.swift b/Session/Media Viewing & Editing/MediaInfoVC.swift
index 5c8353b1c..48398a6d8 100644
--- a/Session/Media Viewing & Editing/MediaInfoVC.swift	
+++ b/Session/Media Viewing & Editing/MediaInfoVC.swift	
@@ -38,7 +38,8 @@ final class MediaInfoVC: BaseVC {
                 arrowsSize: CGSize(
                     width: 20,
                     height: 30
-                )
+                ),
+                cornerRadius: 8
             )
         )
         result.set(.height, to: Self.mediaSize)
diff --git a/Session/Shared/SessionCarouselView+Info.swift b/Session/Shared/SessionCarouselView+Info.swift
index f87d69c86..62e7427c4 100644
--- a/Session/Shared/SessionCarouselView+Info.swift
+++ b/Session/Shared/SessionCarouselView+Info.swift
@@ -15,6 +15,7 @@ extension SessionCarouselView {
         let pageControlStyle: PageControlStyle
         let shouldShowArrows: Bool
         let arrowsSize: CGSize
+        let cornerRadius: CGFloat
         
         // MARK: - Initialization
         
@@ -26,7 +27,8 @@ extension SessionCarouselView {
             shouldShowPageControl: Bool = true,
             pageControlStyle: PageControlStyle,
             shouldShowArrows: Bool = true,
-            arrowsSize: CGSize = .zero
+            arrowsSize: CGSize = .zero,
+            cornerRadius: CGFloat = 0
         ) {
             self.slices = slices
             self.copyOfFirstSlice = copyOfFirstSlice
@@ -37,6 +39,7 @@ extension SessionCarouselView {
             self.pageControlStyle = pageControlStyle
             self.shouldShowArrows = shouldShowArrows && (self.sliceCount > 1)
             self.arrowsSize = arrowsSize
+            self.cornerRadius = cornerRadius
         }
     }
     
diff --git a/Session/Shared/SessionCarouselView.swift b/Session/Shared/SessionCarouselView.swift
index 2d102fc3a..207433f5b 100644
--- a/Session/Shared/SessionCarouselView.swift
+++ b/Session/Shared/SessionCarouselView.swift
@@ -19,6 +19,8 @@ final class SessionCarouselView: UIView, UIScrollViewDelegate {
             width: self.info.sliceSize.width * CGFloat(self.slicesForLoop.count),
             height: self.info.sliceSize.height
         )
+        result.layer.cornerRadius = self.info.cornerRadius
+        result.layer.masksToBounds = true
         
         return result
     }()