diff --git a/master_changes.md b/master_changes.md
index 751177aedde..661c27174d5 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -21,7 +21,7 @@ users)
 ## Plugins
 
 ## Init
-  * ◈ New option `opam init --cygwin-extra-packages=CYGWIN_PKGS --cygwin-internal-install`, to specify additional packages for internal Cygwin [#5930 @moyodiallo - fix #5834]
+  * ◈ New option `opam init --cygwin-extra-packages=CYGWIN_PKGS --cygwin-internal-install`, to specify additional packages for internal Cygwin [#5930, #5964 @moyodiallo - fix #5834]
 
 ## Config report
 
diff --git a/src/client/opamCommands.ml b/src/client/opamCommands.ml
index 89b381f620f..ad1acdd3903 100644
--- a/src/client/opamCommands.ml
+++ b/src/client/opamCommands.ml
@@ -435,6 +435,8 @@ let init cli =
         bad_arg "no-cygwin-setup" "cygwin-extra-packages"
       | `none, Some _, Some _ ->
         bad_arg "cygwin-location" "cygwin-extra-packages"
+      | `none, None, None ->
+        None
       | (`internal | `none), None, pkgs ->
         Some (`internal
                 (OpamStd.Option.default [] pkgs