diff --git a/funkwhale_cli/cli/tracks.py b/funkwhale_cli/cli/tracks.py
index 3f908d79f4289b266d44504d7b1e1076762db07c..4cfa1a833745d2564e2bcc2ccb0d48fbf1631f5e 100644
--- a/funkwhale_cli/cli/tracks.py
+++ b/funkwhale_cli/cli/tracks.py
@@ -61,11 +61,10 @@ def extract_filename_params(track_data, format):
     filename_params["album"] = filename_params.get("album_title", None)
     filename_params["artist"] = filename_params.get("artist_name", None)
     filename_params["extension"] = format
-    filename_params["year"] = (
-        filename_params.get("album_release_date", None)[:4]
-        if filename_params.get("album_release_date", None)
-        else None
-    )
+    try:
+        filename_params["year"] = filename_params["album_release_date"][:4]
+    except (KeyError, TypeError):
+        filename_params["year"] = None
     return {
         k: utils.sanitize_recursive(v) for k, v in filename_params.items()
     }