diff --git a/copyparty/th_cli.py b/copyparty/th_cli.py
index 2eee39426..7387092b0 100644
--- a/copyparty/th_cli.py
+++ b/copyparty/th_cli.py
@@ -102,7 +102,9 @@ class ThumbCli(object):
                 ):
                     sfmt = "j"
 
-            if sfmt == "x" and not self.can_jxl:
+            if sfmt == "x" and (
+                not self.can_jxl or (not H_PIL_JXL and ext in self.fmt_raw)
+            ):
                 sfmt = "w"
 
             vf_crop = dbv.flags["crop"]