diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index b8dc68f1f8..325773a81e 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -30,6 +30,8 @@
 // no php execution timeout for webdav
 set_time_limit(0);
 
+// Turn off output buffering to prevent memory problems
+\OC_Util::obEnd();
 
 // Backends
 $authBackend = new \OC\Connector\Sabre\Auth();
diff --git a/lib/private/util.php b/lib/private/util.php
index 102dc8c59d..f4624cfe96 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -672,7 +672,6 @@ class OC_Util {
 			),
 			'ini' => [
 				'mbstring.func_overload' => 0,
-				'output_buffering' => false,
 				'default_charset' => 'UTF-8',
 			],
 		);