diff --git a/install/52_collect_database_size_stats.sql b/install/52_collect_database_size_stats.sql
index d65158d..ffadf54 100644
--- a/install/52_collect_database_size_stats.sql
+++ b/install/52_collect_database_size_stats.sql
@@ -176,7 +176,7 @@ BEGIN
                     d.name,
                     d.database_id
                 FROM sys.databases AS d
-                WHERE d.state_desc = N'ONLINE'
+                WHERE d.state = 0 /*ONLINE only — skip RESTORING databases (mirroring/AG secondary)*/
                 AND   d.database_id > 0
                 AND   HAS_DBACCESS(d.name) = 1
                 ORDER BY
diff --git a/install/53_collect_server_properties.sql b/install/53_collect_server_properties.sql
index 6bdce6f..fb1b1c2 100644
--- a/install/53_collect_server_properties.sql
+++ b/install/53_collect_server_properties.sql
@@ -133,8 +133,9 @@ BEGIN
                 SELECT
                     d.name
                 FROM sys.databases AS d
-                WHERE d.state_desc = N'ONLINE'
+                WHERE d.state = 0 /*ONLINE only — skip RESTORING databases (mirroring/AG secondary)*/
                 AND   d.database_id > 4 /*Skip system databases*/
+                AND   HAS_DBACCESS(d.name) = 1
                 ORDER BY
                     d.database_id;