diff --git a/lib/private/Preview/Bundled.php b/lib/private/Preview/Bundled.php
index f3441b5211c66..1e44106e4b2af 100644
--- a/lib/private/Preview/Bundled.php
+++ b/lib/private/Preview/Bundled.php
@@ -32,6 +32,11 @@
  */
 abstract class Bundled extends ProviderV2 {
 	protected function extractThumbnail(File $file, $path): ?IImage {
+
+		if ($file->getSize() === 0) {
+			return null;
+		}
+
 		$sourceTmp = \OC::$server->getTempManager()->getTemporaryFile();
 		$targetTmp = \OC::$server->getTempManager()->getTemporaryFile();
 
diff --git a/lib/private/Preview/OpenDocument.php b/lib/private/Preview/OpenDocument.php
index 01e191c278958..eeb0622be607b 100644
--- a/lib/private/Preview/OpenDocument.php
+++ b/lib/private/Preview/OpenDocument.php
@@ -43,7 +43,7 @@ public function getMimeType(): string {
 	 */
 	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
 		$image = $this->extractThumbnail($file, 'Thumbnails/thumbnail.png');
-		if ($image->valid()) {
+		if (!empty($image) && $image->valid()) {
 			return $image;
 		}
 		return null;