diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 8892194f32..cea7a38d41 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -244,8 +244,13 @@ class Encryption extends Wrapper {
 
 		if($shouldEncrypt === true && !$this->util->isExcluded($fullPath) && $encryptionModule !== null) {
 			$source = $this->storage->fopen($path, $mode);
+			$uid = $this->uid;
+			if (is_null($uid)) {
+				list($owner, ) = $this->util->getUidAndFilename($fullPath);
+				$uid = $owner;
+			}
 			$handle = \OC\Files\Stream\Encryption::wrap($source, $path, $fullPath, $header,
-				$this->uid, $encryptionModule, $this->storage, $this, $this->util, $mode,
+				$uid, $encryptionModule, $this->storage, $this, $this->util, $mode,
 				$size, $unencryptedSize);
 			return $handle;
 		} else {