diff --git a/common/jobs/job_export_pcb_svg.cpp b/common/jobs/job_export_pcb_svg.cpp
index 50440c8dda..321c89ddeb 100644
--- a/common/jobs/job_export_pcb_svg.cpp
+++ b/common/jobs/job_export_pcb_svg.cpp
@@ -32,7 +32,7 @@ JOB_EXPORT_PCB_SVG::JOB_EXPORT_PCB_SVG() :
     JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::SVG, "svg", false ),
     m_pageSizeMode( 0 ),
     m_precision( 4 ),
-    m_genMode( GEN_MODE::SINGLE )
+    m_genMode( GEN_MODE::SINGLE )   // TODO change to MULTI for V10
 {
     m_plotDrawingSheet = true;
 
@@ -64,4 +64,4 @@ wxString JOB_EXPORT_PCB_SVG::GetSettingsDialogTitle() const
 }
 
 
-REGISTER_JOB( pcb_export_svg, _HKI( "PCB: Export SVG" ), KIWAY::FACE_PCB, JOB_EXPORT_PCB_SVG );
\ No newline at end of file
+REGISTER_JOB( pcb_export_svg, _HKI( "PCB: Export SVG" ), KIWAY::FACE_PCB, JOB_EXPORT_PCB_SVG );
diff --git a/kicad/cli/command_pcb_export_svg.cpp b/kicad/cli/command_pcb_export_svg.cpp
index 34b5eaf67c..7b3960017d 100644
--- a/kicad/cli/command_pcb_export_svg.cpp
+++ b/kicad/cli/command_pcb_export_svg.cpp
@@ -162,11 +162,11 @@ int CLI::PCB_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
 
     if( m_argParser.get<bool>( ARG_MODE_MULTI ) )
         svgJob->m_genMode = JOB_EXPORT_PCB_SVG::GEN_MODE::MULTI;
-    else
+    else if( m_argParser.get<bool>( ARG_MODE_SINGLE ) )
         svgJob->m_genMode = JOB_EXPORT_PCB_SVG::GEN_MODE::SINGLE;
-
-    if( svgJob->m_genMode == JOB_EXPORT_PCB_SVG::GEN_MODE::SINGLE )
+    else if( svgJob->m_genMode == JOB_EXPORT_PCB_SVG::GEN_MODE::SINGLE )
     {
+        // TODO remove this block when changing the default for JOB_EXPORT_PCB_SVG::m_genMode
         wxFprintf( stdout, wxT( "\033[33;1m%s\033[0m\n" ),
                    _( "This command has deprecated behavior as of KiCad 9.0, the default behavior "
                       "of this command will change in a future release." ) );