diff --git a/src/run_modules/experiment_setup.py b/src/run_modules/experiment_setup.py
index 95bd5056febbe06babfd59191332c1f4cb8078d4..150399cb2e4997a6b9adfb30dfa3ff89de73d4ac 100644
--- a/src/run_modules/experiment_setup.py
+++ b/src/run_modules/experiment_setup.py
@@ -21,7 +21,8 @@ DEFAULT_VAR_ALL_DICT = {'o3': 'dma8eu', 'relhum': 'average_values', 'temp': 'max
                         'pblheight': 'maximum'}
 DEFAULT_TRANSFORMATION = {"scope": "data", "method": "standardise", "mean": "estimate"}
 DEFAULT_PLOT_LIST = ["PlotMonthlySummary", "PlotStationMap", "PlotClimatologicalSkillScore", "PlotTimeSeries",
-                     "PlotCompetitiveSkillScore", "PlotBootstrapSkillScore", "plot_conditional_quantiles"]
+                     "PlotCompetitiveSkillScore", "PlotBootstrapSkillScore", "plot_conditional_quantiles",
+                     "PlotAvailability"]
 
 
 class ExperimentSetup(RunEnvironment):
diff --git a/src/run_modules/post_processing.py b/src/run_modules/post_processing.py
index 1361dab63e93ea813c3b92394822fb683c7621c1..8a962888ec0b789a14a24b20c97148e7a8315b30 100644
--- a/src/run_modules/post_processing.py
+++ b/src/run_modules/post_processing.py
@@ -214,8 +214,9 @@ class PostProcessing(RunEnvironment):
         if "PlotTimeSeries" in plot_list:
             PlotTimeSeries(self.test_data.stations, path, r"forecasts_%s_test.nc", plot_folder=self.plot_path,
                            sampling=self._sampling)
-        avail_data = {"train": self.train_data, "val": self.val_data, "test": self.test_data}
-        PlotAvailability(avail_data, plot_folder=self.plot_path)
+        if "PlotAvailability" in plot_list:
+            avail_data = {"train": self.train_data, "val": self.val_data, "test": self.test_data}
+            PlotAvailability(avail_data, plot_folder=self.plot_path)
 
     def calculate_test_score(self):
         test_score = self.model.evaluate_generator(generator=self.test_data_distributed.distribute_on_batches(),