diff --git a/server/routes/sensor_values.go b/server/routes/sensor_values.go
index 81d2fe8..5cca959 100644
--- a/server/routes/sensor_values.go
+++ b/server/routes/sensor_values.go
@@ -2,6 +2,7 @@ package routes
 
 import (
 	"basic-sensor-receiver/app"
+	"database/sql"
 	"net/http"
 	"strconv"
 
@@ -91,6 +92,11 @@ func GetSensorLatestValue(s *app.Server) gin.HandlerFunc {
 		value, err := s.Services.SensorValues.GetLatest(sensorId, query.To)
 
 		if err != nil {
+			if err == sql.ErrNoRows {
+				c.AbortWithError(404, err)
+				return
+			}
+
 			c.AbortWithError(500, err)
 			return
 		}