diff --git a/lib/private/preview.php b/lib/private/preview.php
index bc3eccbafb4..21fa581d84e 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -567,8 +567,6 @@ class Preview {
 			return;
 		}
 
-		$image->fixOrientation();
-
 		$realX = (int)$image->width();
 		$realY = (int)$image->height();
 
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index cec5d7c0170..ec5b87befea 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -29,6 +29,7 @@ class Image extends Provider {
 			$fileName = $fileview->getLocalFile($path);
 		}
 		$image->loadFromFile($fileName);
+		$image->fixOrientation();
 
 		return $image->valid() ? $image : false;
 	}