diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c4fbd5..0525781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fixed default for with_choice when convert is not set.
 ### Added
 - Add a `clobber` argument to touch.
 
diff --git a/src/rra_tools/cli_tools/options.py b/src/rra_tools/cli_tools/options.py
index 0cc19c1..ca6fb8f 100644
--- a/src/rra_tools/cli_tools/options.py
+++ b/src/rra_tools/cli_tools/options.py
@@ -127,7 +127,7 @@ def with_choice(
         names.append(f"-{short_name}")
     option_type, default, show_default = process_choices(allow_all, choices)
 
-    if convert is None:
+    if choices and convert is None:
         convert = allow_all
 
     if convert: