diff --git a/src/main/java/org/olat/core/util/WorkThreadInformations.java b/src/main/java/org/olat/core/util/WorkThreadInformations.java
index 568e8dbb678ecd5f51854612f71e207e244238ea..8d05d62a14628cde05c557ae99dbf5a85a0b116e 100644
--- a/src/main/java/org/olat/core/util/WorkThreadInformations.java
+++ b/src/main/java/org/olat/core/util/WorkThreadInformations.java
@@ -21,8 +21,6 @@
 package org.olat.core.util;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -103,19 +101,4 @@ public class WorkThreadInformations {
 			log.error("Cannot write info message about FolderIndexerWorker: " + filePath, e);
 		}
 	}
-	
-	/**
-	 * The method return an exception if something happens.
-	 * 
-	 * @param filePath
-	 * @throws IOException
-	 */
-	public static void setInfoFiles(String filePath) throws IOException {
-		File file = new File(WebappHelper.getUserDataRoot(), "threadInfos");
-		if(!file.exists()) {
-			file.mkdirs();
-		}
-		File infoFile = new File(file, Thread.currentThread().getName());
-		FileUtils.save(new FileOutputStream(infoFile), filePath, "UTF-8");
-	}
 }
diff --git a/src/main/java/org/olat/restapi/system/StatusWebservice.java b/src/main/java/org/olat/restapi/system/StatusWebservice.java
index 493a481aefaf48e3f9395ee4288feb4c0ee0b021..416eb679857cbb95ad39ba891666f73248ebdb9a 100644
--- a/src/main/java/org/olat/restapi/system/StatusWebservice.java
+++ b/src/main/java/org/olat/restapi/system/StatusWebservice.java
@@ -19,6 +19,9 @@
  */
 package org.olat.restapi.system;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
@@ -35,8 +38,10 @@ import org.olat.core.id.OLATResourceable;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
 import org.olat.core.util.CodeHelper;
+import org.olat.core.util.FileUtils;
 import org.olat.core.util.SessionInfo;
 import org.olat.core.util.UserSession;
+import org.olat.core.util.WebappHelper;
 import org.olat.core.util.WorkThreadInformations;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.core.util.session.UserSessionManager;
@@ -78,11 +83,12 @@ public class StatusWebservice {
 		
 		//File
 		try {
-			stats.setWriteFile(true);
 			long startFile = System.nanoTime();
-			WorkThreadInformations.setInfoFiles("ping");
+			File infoFile = setInfoFiles("ping");
 			WorkThreadInformations.unset();
 			stats.setWriteFileInMilliseconds(CodeHelper.nanoToMilliTime(startFile));
+			stats.setWriteFile(infoFile.exists());
+			infoFile.delete();
 		} catch (Exception e) {
 			stats.setWriteFile(false);
 			stats.setWriteFileInMilliseconds(-1l);
@@ -135,5 +141,20 @@ public class StatusWebservice {
 
 		return Response.ok(stats).build();
 	}
-
+	
+	/**
+	 * The method return an exception if something happens.
+	 * 
+	 * @param filePath
+	 * @throws IOException
+	 */
+	public static File setInfoFiles(String filePath) throws IOException {
+		File file = new File(WebappHelper.getUserDataRoot(), "threadInfos");
+		if(!file.exists()) {
+			file.mkdirs();
+		}
+		File infoFile = new File(file, Thread.currentThread().getName());
+		FileUtils.save(new FileOutputStream(infoFile), filePath, "UTF-8");
+		return infoFile;
+	}
 }