diff --git a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
index 05aee81453b8b62de06c103d4b96c70b40cfce0b..c0a1a8935fd88ad7937e25c645de9b694118ee2b 100644
--- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
@@ -118,19 +118,20 @@ public:
       ComputePolygonStatistics( imageList, validationVectorFileList, fileNames.polyStatValidOutputs );
       ComputeSamplingRate( fileNames.polyStatValidOutputs, fileNames.rateValidOut, rates.fmv );
       SelectAndExtractValidationSamples( fileNames, imageList, validationVectorFileList );
-//    if( HasInputVector ) // if input vector is provided the sampleTrainOutputs is the previously extracted sampleOutputs
+
       fileNames.sampleTrainOutputs = fileNames.sampleOutputs;
       }
     else if(GetParameterFloat("sample.vtr") != 0.0)// Split training data to validation
       {
-//      if( !HasInputVector ) // Compute one class statistics and sampling rate for the generated vector.
-//        ComputePolygonStatistics( imageList, fileNames.sampleOutputs, fileNames.polyStatTrainOutputs );
-//        ComputeSamplingRate( fileNames.polyStatTrainOutputs, fileNames.rateTrainOut, rates.fmt );
       SplitTrainingToValidationSamples( fileNames, imageList );
       }
-    else // nothing to do, except update fileNames
+    else // Update sampleTrainOutputs and clear sampleValidOutputs
       {
       fileNames.sampleTrainOutputs = fileNames.sampleOutputs;
+
+      // Corner case where no dedicated validation set is provided and split ratio is set to 0 (all samples for training)
+      // In this case SampleValidOutputs should be cleared
+      fileNames.sampleValidOutputs.clear();
       }
   }
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
index 6e7ffc57c2f779701ac7f81d34e9c6daeace62f7..d4b579827a9a31a2adfd9ddf80fa31fef1812542 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
@@ -234,7 +234,6 @@ protected:
         sampleTrainOutputs.push_back( outModel + "_samplesTrain_" + strIndex + ".shp" );
         sampleValidOutputs.push_back( outModel + "_samplesValid_" + strIndex + ".shp" );
         }
-
     }
 
     void clear()