diff --git a/src/logic/database/Crud.py b/src/logic/database/Crud.py
index 332d9c777009e6bd9df2d0319027ce94aa6521bc..cb5f45f4253632ee269875f24d338df51991703d 100644
--- a/src/logic/database/Crud.py
+++ b/src/logic/database/Crud.py
@@ -143,7 +143,10 @@ def get_measurement(db: Session, measurementId: int) -> Models.Measurement:
 
 @notify_backup_service(BACKUP_SERVICE)
 def create_measurement(db: Session, measurement: Schemas.MeasurementCreate) -> Models.Measurement:
-    dbMeasurement = Models.Measurement(**measurement.dict(), timestamp=__get_current_datetime())
+    if measurement.timestamp is None:
+        measurement.timestamp = __get_current_datetime()
+
+    dbMeasurement = Models.Measurement(**measurement.dict())
     db.add(dbMeasurement)
     db.commit()
     db.refresh(dbMeasurement)
diff --git a/src/logic/database/Schemas.py b/src/logic/database/Schemas.py
index fa5e9fc9cb4ca03f5bdabce5a1f221b520f967cb..a58df2082e816b9da944349067043fa366ceccc3 100644
--- a/src/logic/database/Schemas.py
+++ b/src/logic/database/Schemas.py
@@ -1,6 +1,7 @@
 from typing import List
 
 from pydantic import BaseModel, Field
+from typing import Optional
 
 
 # ===== special =====
@@ -42,6 +43,7 @@ class Measurement(BaseModel):
 
 class MeasurementCreate(BaseModel):
     value: str = Field(..., min_length=1)
+    timestamp: Optional[str]
     sensor_id: int