diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index 0f76d564cdf..fdd089e72d9 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -135,19 +135,37 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
                     if (tableInterface) {
                         auto *tableElement = [QMacAccessibilityElement elementWithInterface:table];
                         Q_ASSERT(tableElement);
+                        if (!tableElement->rows
+                         || int(tableElement->rows.count) <= m_rowIndex
+                         || int(tableElement->rows.count) != tableInterface->rowCount()) {
+                            qCWarning(lcAccessibilityTable)
+                                       << "Cell requested for row" << m_rowIndex << "is out of"
+                                       << "bounds for table with" << (tableElement->rows ?
+                                            tableElement->rows.count : tableInterface->rowCount())
+                                       << "rows! Resizing table model.";
+                            [tableElement updateTableModel];
+                        }
+
                         Q_ASSERT(tableElement->rows);
+                        Q_ASSERT(int(tableElement->rows.count) > m_rowIndex);
+
+                        auto *rowElement = tableElement->rows[m_rowIndex];
+                        if (!rowElement->columns || int(rowElement->columns.count) != tableInterface->columnCount()) {
+                            if (rowElement->columns) {
+                                qCWarning(lcAccessibilityTable)
+                                        << "Table representation column count is out of sync:"
+                                        << rowElement->columns.count << "!=" << tableInterface->columnCount();
+                            }
+                            rowElement->columns = [rowElement populateTableRow:rowElement->columns
+                                                              count:tableInterface->columnCount()];
+                        }
 
                         qCDebug(lcAccessibilityTable) << "Creating cell representation for"
                                                       << m_rowIndex << m_columnIndex
                                                       << "in table with"
-                                                      << tableElement->rows.count << "rows";
+                                                      << tableElement->rows.count << "rows and"
+                                                      << rowElement->columns.count << "columns";
 
-                        Q_ASSERT(int(tableElement->rows.count) > m_rowIndex);
-                        auto *rowElement = tableElement->rows[m_rowIndex];
-                        if (!rowElement->columns) {
-                            rowElement->columns = [rowElement populateTableRow:rowElement->columns
-                                                              count:tableInterface->columnCount()];
-                        }
                         rowElement->columns[m_columnIndex] = self;
                     }
                 }
@@ -223,6 +241,10 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
 - (NSMutableArray *)populateTableArray:(NSMutableArray *)array role:(NSAccessibilityRole)role count:(int)count
 {
     if (QAccessibleInterface *iface = self.qtInterface) {
+        if (array && int(array.count) != count) {
+            [array release];
+            array = nil;
+        }
         if (!array) {
             array = [NSMutableArray<QMacAccessibilityElement *> arrayWithCapacity:count];
             [array retain];
@@ -253,6 +275,11 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
 - (NSMutableArray *)populateTableRow:(NSMutableArray *)array count:(int)count
 {
     Q_ASSERT(synthesizedRole == NSAccessibilityRowRole);
+    if (array && int(array.count) != count) {
+        [array release];
+        array = nil;
+    }
+
     if (!array) {
         array = [NSMutableArray<QMacAccessibilityElement *> arrayWithCapacity:count];
         [array retain];