diff --git a/classes/WpMatomo/Admin/SystemReport.php b/classes/WpMatomo/Admin/SystemReport.php
index d49adb0c5..f7cddad96 100644
--- a/classes/WpMatomo/Admin/SystemReport.php
+++ b/classes/WpMatomo/Admin/SystemReport.php
@@ -515,9 +515,10 @@ private function get_matomo_info() {
 				];
 			} catch ( Exception $e ) {
 				$rows[] = [
-					'name'    => esc_html__( 'Matomo System Check', 'matomo' ),
-					'value'   => 'Failed to run Matomo system check.',
-					'comment' => $e->getMessage(),
+					'name'     => esc_html__( 'Matomo System Check', 'matomo' ),
+					'value'    => 'Failed to run Matomo system check.',
+					'comment'  => $e->getMessage(),
+					'is_error' => true,
 				];
 			}
 		}
@@ -674,8 +675,9 @@ private function get_matomo_info() {
 			} catch (\Exception $e) {
 				$rows[] = [
 					'name' => esc_html__( 'Supports Async Archiving', 'matomo' ),
-					'value' => 'Failed to check if async archiving is supported.',
+					'value' => 'Could not check if async archiving is supported.',
 					'comment' => $e->getMessage(),
+					'is_error' => true,
 				];
 			}
 
@@ -703,6 +705,7 @@ private function get_matomo_info() {
 					'name'    => 'Location provider ID',
 					'value'   => 'Failed to get the configured Location Provider.',
 					'comment' => $e->getMessage(),
+					'is_error' => true,
 				];
 			}
 
@@ -745,7 +748,7 @@ private function get_matomo_info() {
 					$rows[] = [
 						'name' => 'Incompatible Matomo plugin check',
 						'value' => 'Failed to check for incompatible Matomo plugins.',
-						'is_error' => true, // TODO: use this everywhere there is an exception
+						'is_error' => true,
 						'comment' => $e->getMessage(),
 					];
 				}