diff --git a/core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java b/core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java
index cd170bc7eb7..3cac23d87a5 100644
--- a/core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java
+++ b/core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java
@@ -390,12 +390,14 @@ public class InternalClusterInfoService extends AbstractComponent implements Clu
             try {
                 nodeLatch.await(fetchTimeout.getMillis(), TimeUnit.MILLISECONDS);
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt(); // restore interrupt status
                 logger.warn("Failed to update node information for ClusterInfoUpdateJob within 15s timeout");
             }
 
             try {
                 indicesLatch.await(fetchTimeout.getMillis(), TimeUnit.MILLISECONDS);
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt(); // restore interrupt status
                 logger.warn("Failed to update shard information for ClusterInfoUpdateJob within 15s timeout");
             }