diff --git a/pyproject.toml b/pyproject.toml
index a9c67b3e5341912f508bee935bf94227708a76cd..dce07958e11bdf95a82047ddfd6b24a896f39ca0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "StorageLeaf"
-version = "2.17.0"
+version = "2.18.0"
 description = "Accepts sensor data and saves them into a database. The saved data can be accessed via api."
 authors = ["TheCodeLabsDevs"]
 
diff --git a/src/logic/database/Crud.py b/src/logic/database/Crud.py
index f9916935f16da7333229ebb4b108c3cc51166612..8a9cb7258b36ffdbb8c3c74dec079ea511f8b00a 100644
--- a/src/logic/database/Crud.py
+++ b/src/logic/database/Crud.py
@@ -118,9 +118,9 @@ 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(Models.Measurement.sensor_id == sensorId) \
             .filter(and_(startDateTime <= Models.Measurement.timestamp,
-                         endDateTime >= Models.Measurement.timestamp,
-                         Models.Measurement.sensor_id == sensorId)) \
+                         endDateTime >= Models.Measurement.timestamp)) \
             .order_by(Models.Measurement.timestamp.desc()) \
             .all()
 
diff --git a/src/version.json b/src/version.json
index d1cae61f2f251884e982e1a036a428d18c12becb..3c1c7856dbfb29f2f90c489164a83c29524f801e 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,7 +1,7 @@
 {
     "version": {
-        "name": "v2.17.0",
-        "code": 33,
-        "date": "17.06.24"
+        "name": "v2.18.0",
+        "code": 34,
+        "date": "09.09.24"
     }
 }
\ No newline at end of file