2 files changed, 7 insertions, 1 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
index 69c6c9681bc..bbb47d14571 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
@@ -110,7 +110,7 @@ public class Coverage {
         return switch (fullReason) {
             case EXPLICITLY_FULL: yield true;
             case EXPLICITLY_INCOMPLETE: yield false;
-            case DOCUMENT_COUNT: yield docs == active;
+            case DOCUMENT_COUNT: yield (docs == active) && !((active == 0) && isDegradedByTimeout()) ;
         };
     }
 
@@ -163,6 +163,9 @@ public class Coverage {
         if (docs < total) {
             return (int) Math.round(docs * 100.0d / total);
         }
+        if ((total == 0) && isDegradedByTimeout()) {
+            return 0;
+        }
         return getFullResultSets() * 100 / getResultSets();
     }
 
diff --git a/container-core/src/main/java/com/yahoo/container/logging/Coverage.java b/container-core/src/main/java/com/yahoo/container/logging/Coverage.java
index ee85711852d..397ff35b54c 100644
--- a/container-core/src/main/java/com/yahoo/container/logging/Coverage.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/Coverage.java
@@ -59,6 +59,9 @@ public class Coverage {
         if (docs < total) {
             return (int) Math.round(docs * 100.0d / total);
         }
+        if ((total == 0) && isDegradedByTimeout()) {
+            return 0;
+        }
         return 100;
     }