diff --git a/backend/src/app/media.clj b/backend/src/app/media.clj
index d3ff7fdff2..30527857ad 100644
--- a/backend/src/app/media.clj
+++ b/backend/src/app/media.clj
@@ -184,8 +184,8 @@
                             :env (get-imagemagick-env)
                             :timeout 60)]
     (when (not= 0 (:exit result))
-      (ex/raise :type :internal
-                :code :imagemagick-error
+      (ex/raise :type :validation
+                :code :invalid-image
                 :hint (str "ImageMagick command failed: " (:err result))
                 :cmd cmd
                 :exit (:exit result)))
diff --git a/backend/test/backend_tests/media_test.clj b/backend/test/backend_tests/media_test.clj
index 85b749274c..f4d6d78e81 100644
--- a/backend/test/backend_tests/media_test.clj
+++ b/backend/test/backend_tests/media_test.clj
@@ -67,8 +67,8 @@
         (t/is false "should have thrown")
         (catch Exception e
           (let [data (ex-data e)]
-            ;; Could be validation or imagemagick-error depending on what magick does
-            (t/is (contains? #{:validation :internal} (:type data)))))
+            (t/is (= :validation (:type data)))
+            (t/is (= :invalid-image (:code data)))))
         (finally
           (fs/delete path))))))
 
diff --git a/frontend/src/app/main/data/media.cljs b/frontend/src/app/main/data/media.cljs
index 688d4d9d5f..74eec0ac56 100644
--- a/frontend/src/app/main/data/media.cljs
+++ b/frontend/src/app/main/data/media.cljs
@@ -70,6 +70,9 @@
               (= (:code error) :media-type-mismatch)
               (tr "errors.media-type-mismatch")
 
+              (= (:code error) :invalid-image)
+              (tr "errors.media-type-not-allowed")
+
               :else
               (tr "errors.unexpected-error"))]
     (rx/of (ntf/error msg))))