diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 0ab7e7674c..1713bcc22c 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -27,7 +27,7 @@ $RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
 
 OC_App::loadApps($RUNTIME_APPTYPES);
 
-ob_end_clean();
+OC_Util::obEnd();
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
diff --git a/apps/files/download.php b/apps/files/download.php
index 0d632c9b2c..6475afb56e 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -44,5 +44,5 @@ header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 OCP\Response::disableCaching();
 header('Content-Length: '.OC_Filesystem::filesize($filename));
 
-@ob_end_clean();
+OC_Util::obEnd();
 OC_Filesystem::readfile( $filename );
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 578441ee70..1b8033943a 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -32,7 +32,7 @@ class OC_EventSource{
 	private $fallBackId=0;
 
 	public function __construct() {
-		@ob_end_clean();
+		OC_Util::obEnd();
 		header('Cache-Control: no-cache');
 		$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
 		if($this->fallback) {
diff --git a/lib/files.php b/lib/files.php
index 912de5655b..b4a4145a49 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -195,7 +195,7 @@ class OC_Files {
 			$zip=false;
 			$filename=$dir.'/'.$files;
 		}
-		@ob_end_clean();
+		OC_Util::obEnd();
 		if($zip or OC_Filesystem::is_readable($filename)) {
 			header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 			header('Content-Transfer-Encoding: binary');
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 0229213ebc..1185c25c24 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -195,7 +195,7 @@ class OC_FilesystemView {
 		return $this->basicOperation('filesize', $path);
 	}
 	public function readfile($path) {
-		@ob_end_clean();
+		OC_Util::obEnd();
 		$handle=$this->fopen($path, 'rb');
 		if ($handle) {
 			$chunkSize = 8192;// 8 MB chunks