diff --git a/apps/dav/lib/Upload/AssemblyStream.php b/apps/dav/lib/Upload/AssemblyStream.php
index e20d8f9adbad7..3ba24bf60fd72 100644
--- a/apps/dav/lib/Upload/AssemblyStream.php
+++ b/apps/dav/lib/Upload/AssemblyStream.php
@@ -182,7 +182,7 @@ public function stream_flush() {
 	 * @return bool
 	 */
 	public function stream_eof() {
-		return $this->pos >= $this->size;
+		return $this->pos >= $this->size || $this->currentStream === null;
 	}
 
 	/**