diff --git a/app.R b/app.R
index 438c1652..996fe2bd 100644
--- a/app.R
+++ b/app.R
@@ -136,7 +136,11 @@ shinyApp(
   server = function(input, output, session) {
     filtered_scorecards_reactive <- reactive({
       agg_forecasters <- unique(c(input$selected_forecasters, input$baseline))
-      if (length(agg_forecasters) == 0) { return(data.frame()) }
+      if (length(agg_forecasters) == 0 ||
+          all(agg_forecasters == "" | is.null(agg_forecasters) | is.na(agg_forecasters))
+      ) {
+        return(data.frame())
+      }
 
       processed_evaluations_internal <- lapply(agg_forecasters, function(forecaster) {
           load_forecast_data(forecaster) %>>%
diff --git a/run.R b/run.R
index b035b00b..115d0fde 100644
--- a/run.R
+++ b/run.R
@@ -119,7 +119,7 @@ if (use_shiny == "y") {
   )
 
   # Add ensembles
-  ensemble_options <- tar_read(ensemble_forecasters)[["parent_id"]]
+  ensemble_options <- unique(tar_read(ensemble_forecasters)[["parent_id"]])
   ensemble_options <- setNames(
     # File names
     paste0("ensemble_score_", ensemble_options),
@@ -127,7 +127,7 @@ if (use_shiny == "y") {
     paste0("ensemble.", ensemble_options)
   )
 
-  external_options <- tar_read(external_names)
+  external_options <- unique(tar_read(external_names))
   EXTERNAL_PREFIX <- "[external] "
   if (!is.null(external_options) && length(external_options) > 0) {
     external_options <- setNames(