diff --git a/ios/RocketChat Watch App/Views/ChatScrollView.swift b/ios/RocketChat Watch App/Views/ChatScrollView.swift
index bee358c3f..7e2baf745 100644
--- a/ios/RocketChat Watch App/Views/ChatScrollView.swift	
+++ b/ios/RocketChat Watch App/Views/ChatScrollView.swift	
@@ -6,29 +6,23 @@ import SwiftUI
 /// We hide the indicators for the flipped scroll view, since they appear reversed.
 struct ChatScrollView<Content: View>: View {
 	private let content: () -> Content
-		
+	
 	init(@ViewBuilder content: @escaping () -> Content) {
 		self.content = content
 	}
 	
 	var body: some View {
-		ScrollView(showsIndicators: false) {
-			content()
-				.rotationEffect(.degrees(180))
+		if #available(watchOS 10.0, *) {
+			ScrollView {
+				content()
+			}
+			.defaultScrollAnchor(.bottom)
+		} else {
+			ScrollView(showsIndicators: false) {
+				content()
+					.rotationEffect(.degrees(180))
+			}
+			.rotationEffect(.degrees(180))
 		}
-		.rotationEffect(.degrees(180))
 	}
 }
-
-// if #available(watchOS 10.0, *) {
-// 	ScrollView {
-// 		content()
-// 	}
-// 	.defaultScrollAnchor(.bottom)
-// } else {
-// 	ScrollView(showsIndicators: false) {
-// 		content()
-// 			.rotationEffect(.degrees(180))
-// 	}
-// 	.rotationEffect(.degrees(180))
-// }