diff --git a/lib/base.php b/lib/base.php
index 7d86245818df0..5935fc236aa41 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -515,6 +515,10 @@ private static function performSameSiteCookieProtection() {
 		$incompatibleUserAgents = [
 			// OS X Finder
 			'/^WebDAVFS/',
+			// Gnome Nautilus
+			'/^gvfs/',
+			// DAVdroid
+			'/^DAVdroid/',
 		];
 		if($request->isUserAgent($incompatibleUserAgents)) {
 			return;