diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsReportCard.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsReportCard.swift
index 5bde4f94e00..42968ba886c 100644
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsReportCard.swift	
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsReportCard.swift	
@@ -27,7 +27,6 @@ struct AnalyticsReportCard: View {
 
     // Layout metrics that scale based on accessibility changes
     @ScaledMetric private var scaledChartWidth: CGFloat = Layout.chartWidth
-    @ScaledMetric private var scaledChartHeight: CGFloat = Layout.chartHeight
 
     var body: some View {
         VStack(alignment: .leading, spacing: Layout.titleSpacing) {
@@ -57,7 +56,8 @@ struct AnalyticsReportCard: View {
                             .shimmering(active: isRedacted)
 
                         AnalyticsLineChart(dataPoints: leadingChartData, lineChartColor: leadingChartColor)
-                            .frame(width: scaledChartWidth, height: scaledChartHeight)
+                            .aspectRatio(Layout.chartAspectRatio, contentMode: .fit)
+                            .frame(maxWidth: scaledChartWidth)
                     }
 
                 }
@@ -81,7 +81,8 @@ struct AnalyticsReportCard: View {
                             .shimmering(active: isRedacted)
 
                         AnalyticsLineChart(dataPoints: trailingChartData, lineChartColor: trailingChartColor)
-                            .frame(width: scaledChartWidth, height: scaledChartHeight)
+                            .aspectRatio(Layout.chartAspectRatio, contentMode: .fit)
+                            .frame(maxWidth: scaledChartWidth)
                     }
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
@@ -107,6 +108,7 @@ private extension AnalyticsReportCard {
         static let columnInnerSpacing: CGFloat = 10
         static let chartHeight: CGFloat = 32
         static let chartWidth: CGFloat = 72
+        static let chartAspectRatio: CGFloat = 2.25
     }
 }
 
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsTimeRangeCard.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsTimeRangeCard.swift
index de7c5861ed3..576804385ee 100644
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsTimeRangeCard.swift	
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsTimeRangeCard.swift	
@@ -49,6 +49,7 @@ struct AnalyticsTimeRangeCard: View {
                             .bold()
                     }
                     .padding(.leading)
+                    .fixedSize(horizontal: false, vertical: true)
                     .frame(maxWidth: .infinity, alignment: .leading)
 
                     Image(uiImage: .chevronDownImage)