diff --git a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
index e1cb4472a..f18ee8bd6 100644
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -103,12 +103,15 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         switch (format.format()) {
             // 2D barcodes
             case AZTEC:
-            case DATA_MATRIX:
             case MAXICODE:
             case PDF_417:
             case QR_CODE:
                 return MAX_WIDTH_2D;
 
+            // 2D but rectangular versions get blurry otherwise
+            case DATA_MATRIX:
+                return MAX_WIDTH_1D;
+
             // 1D barcodes:
             case CODABAR:
             case CODE_39:
diff --git a/app/src/main/java/protect/card_locker/CatimaBarcode.java b/app/src/main/java/protect/card_locker/CatimaBarcode.java
index d19743a0b..d1e74e876 100644
--- a/app/src/main/java/protect/card_locker/CatimaBarcode.java
+++ b/app/src/main/java/protect/card_locker/CatimaBarcode.java
@@ -67,7 +67,6 @@ public class CatimaBarcode {
 
     public boolean isSquare() {
         return mBarcodeFormat == BarcodeFormat.AZTEC
-                || mBarcodeFormat == BarcodeFormat.DATA_MATRIX
                 || mBarcodeFormat == BarcodeFormat.MAXICODE
                 || mBarcodeFormat == BarcodeFormat.QR_CODE;
     }