diff --git a/src/main/java/org/olat/restapi/system/IndexerWebService.java b/src/main/java/org/olat/restapi/system/IndexerWebService.java
index e605717bc49be381705feb911949d2ada3656eb0..a172ae76b22ce48880f2dbee4ae1ad5e2b1062c4 100644
--- a/src/main/java/org/olat/restapi/system/IndexerWebService.java
+++ b/src/main/java/org/olat/restapi/system/IndexerWebService.java
@@ -69,8 +69,13 @@ public class IndexerWebService {
 	@Path("status")
 	@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
 	public Response getStatus(@Context HttpServletRequest request) {
+		String status;
 		SearchServiceStatus serviceStatus = SearchServiceFactory.getService().getStatus();
-		String status = serviceStatus.getStatus();
+		if(serviceStatus instanceof SearchServiceStatusImpl) {
+			status = serviceStatus.getStatus();
+		} else {
+			status = "disabled";
+		}
 		return Response.ok(new IndexerStatus(status)).build();
 	}
 	
@@ -85,8 +90,14 @@ public class IndexerWebService {
 	@Path("status")
 	@Produces({MediaType.TEXT_PLAIN})
 	public Response getPlainTextStatus(@Context HttpServletRequest request) {
+		String status;
 		SearchServiceStatus serviceStatus = SearchServiceFactory.getService().getStatus();
-		return Response.ok(serviceStatus.getStatus()).build();
+		if(serviceStatus instanceof SearchServiceStatusImpl) {
+			status = serviceStatus.getStatus();
+		} else {
+			status = "disabled";
+		}
+		return Response.ok(status).build();
 	}
 	
 	/**
@@ -123,8 +134,10 @@ public class IndexerWebService {
 			stats.setRunningFolderIndexerCount(fStatus.getNumberRunningFolderIndexer());
 			stats.setAvailableFolderIndexerCount(fStatus.getNumberAvailableFolderIndexer());
 			stats.setLastFullIndexTime(fStatus.getLastFullIndexTime());
+			stats.setStatus(status.getStatus());
+		} else {
+			stats.setStatus("disabled");
 		}
-		stats.setStatus(status.getStatus());
 		return stats;
 	}
 }