diff --git a/src/storm-cli-utilities/model-handling.h b/src/storm-cli-utilities/model-handling.h
index a70ddf981..982dd0092 100644
--- a/src/storm-cli-utilities/model-handling.h
+++ b/src/storm-cli-utilities/model-handling.h
@@ -274,8 +274,13 @@ namespace storm {
                 if (counterexampleGeneratorSettings.isCounterexampleSet()) {
                     buildChoiceOrigins = counterexampleGeneratorSettings.isMinimalCommandSetGenerationSet();
                 }
+                options.setBuildChoiceOrigins(buildChoiceOrigins);
             }
-            options.setBuildChoiceOrigins(buildChoiceOrigins);
+            if (input.model->getModelType() == storm::storage::SymbolicModelDescription::ModelType::POMDP) {
+                options.setBuildChoiceOrigins(true);
+                options.setBuildChoiceLabels(true);
+            }
+
             options.setAddOutOfBoundsState(buildSettings.isBuildOutOfBoundsStateSet());
             if (buildSettings.isBuildFullModelSet()) {
                 options.clearTerminalStates();