diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/PhotoThumbnail.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/PhotoThumbnail.java
index bb256d9005..6ffcfead54 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/PhotoThumbnail.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/PhotoThumbnail.java
@@ -112,8 +112,9 @@ private void resetImageView(@NonNull final ImageView imageView) {
 
     private static void setBitmapOrBlack(@NonNull final ImageView imageView,
             @Nullable final ThumbnailBitmap stackBitmap) {
-        if (stackBitmap != null) {
-            imageView.setImageBitmap(stackBitmap.getRotatedBitmap());
+        Bitmap bitmap = (stackBitmap != null) ? stackBitmap.getRotatedBitmap() : null;
+        if (bitmap != null) {
+            imageView.setImageBitmap(bitmap);
         } else {
             imageView.setImageBitmap(null);
             imageView.setBackgroundColor(Color.BLACK);
@@ -132,7 +133,7 @@ static class ThumbnailBitmap {
         }
 
         final Bitmap getRotatedBitmap() {
-            if (rotatedBitmap == null) {
+            if (rotatedBitmap == null && bitmap != null) {
                 Matrix matrix = new Matrix();
                 matrix.postRotate(rotation);
                 rotatedBitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);