diff --git a/picard/ui/options/naming.py b/picard/ui/options/naming.py
index 86e95a3cf..0b9d23bf7 100644
--- a/picard/ui/options/naming.py
+++ b/picard/ui/options/naming.py
@@ -34,8 +34,8 @@ class FileNamingOptionsPage(Component):
         BoolOption("setting", "ascii_filenames", False),
         BoolOption("setting", "rename_files", False),
         BoolOption("setting", "move_files", False),
-        TextOption("setting", "file_naming_format", "%albumartist%/%album%/$num(%tracknumber%,2) %title%"),
-        TextOption("setting", "va_file_naming_format", "%albumartist%/%album%/$num(%tracknumber%,2) %artist% - %title%"),
+        TextOption("setting", "file_naming_format", "$if2(%albumartist%,%artist%)/%album%/$num(%tracknumber%,2) %title%"),
+        TextOption("setting", "va_file_naming_format", "$if2(%albumartist%,%artist%)/%album%/$num(%tracknumber%,2) %artist% - %title%"),
         TextOption("setting", "move_files_to", ""),
         BoolOption("setting", "move_additional_files", False),
         TextOption("setting", "move_additional_files_pattern", "*.jpg *.png"),