diff --git a/src/logic/database/Crud.py b/src/logic/database/Crud.py
index 2256b166aec36dabd517300bccbb3a530e4a9ea3..5fe6860d4a1e9255fb32f734d2d8fbad4518c862 100644
--- a/src/logic/database/Crud.py
+++ b/src/logic/database/Crud.py
@@ -117,11 +117,17 @@ def get_measurements(db: Session, startDateTime: str, endDateTime: str) -> List[
 def get_measurements_for_sensor(db: Session, startDateTime: str,
                                 endDateTime: str, sensorId: int) -> List[Models.Measurement]:
     if startDateTime and endDateTime:
-        return db.query(Models.Measurement).filter(and_(startDateTime <= Models.Measurement.timestamp,
-                                                        endDateTime >= Models.Measurement.timestamp,
-                                                        Models.Measurement.sensor_id == sensorId)).all()
+        return db.query(Models.Measurement) \
+            .filter(and_(startDateTime <= Models.Measurement.timestamp,
+                         endDateTime >= Models.Measurement.timestamp,
+                         Models.Measurement.sensor_id == sensorId)) \
+            .order_by(Models.Measurement.timestamp.desc()) \
+            .all()
 
-    return db.query(Models.Measurement).filter(Models.Measurement.sensor_id == sensorId).all()
+    return db.query(Models.Measurement) \
+        .filter(Models.Measurement.sensor_id == sensorId) \
+        .order_by(Models.Measurement.timestamp.desc()) \
+        .all()
 
 
 def get_latest_measurement_for_sensor(db: Session, sensorId: int) -> Models.Measurement:
diff --git a/src/logic/database/Schemas.py b/src/logic/database/Schemas.py
index f6b6fec9f54e2f40f0dd89074bda2905484c11ac..44be90aac7a45b81e1c9fee11789d63d0f5f6bcc 100644
--- a/src/logic/database/Schemas.py
+++ b/src/logic/database/Schemas.py
@@ -25,8 +25,8 @@ class Version(BaseModel):
 
 
 class MinMax(BaseModel):
-    min: float or None
-    max: float or None
+    min: float = None
+    max: float = None
 
 
 # ===== measurement =====
diff --git a/src/logic/routers/MeasurementRouter.py b/src/logic/routers/MeasurementRouter.py
index c927cf3b548fa65d87d99331bc72542ff6b9f96b..af10479c4b700bff6e4b98debc1ef277fb28ab18 100644
--- a/src/logic/routers/MeasurementRouter.py
+++ b/src/logic/routers/MeasurementRouter.py
@@ -70,7 +70,7 @@ async def get_min_and_max_for_sensor_ids(sensorIds: List[int] = Query(None),
     if values:
         return MinMax(min=min(values), max=max(values))
 
-    return MinMax(min=None, max=None)
+    return MinMax()
 
 
 @router.post('/measurements/', response_model=Schemas.Status,
diff --git a/src/version.json b/src/version.json
index eb4dbd9bdf280998ff184a92c5331572bf9726fc..16a01eb6225fd9815ac279eb8d49a87acc57e3e3 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,7 +1,7 @@
 {
     "version": {
-        "name": "v2.0.3",
-        "code": 11,
+        "name": "v2.0.4",
+        "code": 12,
         "date": "17.01.21"
     }
 }
\ No newline at end of file