diff --git a/app/app.py b/app/app.py
index 0195abb7c4d1b0cad8078ab40edb8facf48f817f..536321918ce76bac961888a58d13d8f2613e00e7 100644
--- a/app/app.py
+++ b/app/app.py
@@ -36,7 +36,8 @@ def get_weather_data():
     # Period first
     weather_data = filter_period(weather_data,time_start,time_end)
     # Parameters next
-    weather_data = filter_params(weather_data, parameters)
+    if parameters is not None:
+        weather_data = filter_params(weather_data, parameters)
     # Aggregation?
 
     return weather_data.as_dict()
diff --git a/app/weatherdata_utils.py b/app/weatherdata_utils.py
index f438fb05bb848fff9d25eaa02ed4cbaf88986b10..8ed9445336746492f287d03e462bee6c25515e7c 100644
--- a/app/weatherdata_utils.py
+++ b/app/weatherdata_utils.py
@@ -21,7 +21,10 @@ def filter_params(weather_data, params):
     #print(params)
     include_columns_indexes = []
     for param in params:
-        include_columns_indexes.append(weather_data.weatherParameters.index(param))
+        try:
+            include_columns_indexes.append(weather_data.weatherParameters.index(param))
+        except ValueError:
+            pass
     for lwd in weather_data.locationWeatherData:
         # Transpose the matrix
         # Referring to this: https://stackoverflow.com/questions/8421337/rotating-a-two-dimensional-array-in-python