diff --git a/server/src/main/scala/za/co/absa/atum/server/api/http/BaseEndpoints.scala b/server/src/main/scala/za/co/absa/atum/server/api/http/BaseEndpoints.scala
index c15d03578..15919c240 100644
--- a/server/src/main/scala/za/co/absa/atum/server/api/http/BaseEndpoints.scala
+++ b/server/src/main/scala/za/co/absa/atum/server/api/http/BaseEndpoints.scala
@@ -71,8 +71,7 @@ trait BaseEndpoints {
       oneOf[ErrorResponse](
         badRequestOneOfVariant,
         generalErrorOneOfVariant,
-        internalServerErrorOneOfVariant,
-        notFoundErrorOneOfVariant
+        internalServerErrorOneOfVariant
       )
     )
   }
diff --git a/server/src/main/scala/za/co/absa/atum/server/api/http/Routes.scala b/server/src/main/scala/za/co/absa/atum/server/api/http/Routes.scala
index cc4ee8eea..01e1ed6ec 100644
--- a/server/src/main/scala/za/co/absa/atum/server/api/http/Routes.scala
+++ b/server/src/main/scala/za/co/absa/atum/server/api/http/Routes.scala
@@ -25,7 +25,7 @@ import sttp.tapir.server.http4s.ztapir.ZHttp4sServerInterpreter
 import sttp.tapir.server.interceptor.metrics.MetricsRequestInterceptor
 import sttp.tapir.swagger.bundle.SwaggerInterpreter
 import sttp.tapir.ztapir._
-import za.co.absa.atum.model.dto.{AdditionalDataDTO, AdditionalDataPatchDTO, CheckpointDTO, CheckpointV2DTO}
+import za.co.absa.atum.model.dto.{AdditionalDataDTO, AdditionalDataPatchDTO, CheckpointV2DTO}
 import za.co.absa.atum.server.Constants.{SwaggerApiName, SwaggerApiVersion}
 import za.co.absa.atum.server.api.controller.{CheckpointController, FlowController, PartitioningController}
 import za.co.absa.atum.server.api.http.ApiPaths.V2Paths
diff --git a/server/src/test/scala/za/co/absa/atum/server/api/repository/PartitioningRepositoryUnitTests.scala b/server/src/test/scala/za/co/absa/atum/server/api/repository/PartitioningRepositoryUnitTests.scala
index 0c78717e6..4e2bec8e1 100644
--- a/server/src/test/scala/za/co/absa/atum/server/api/repository/PartitioningRepositoryUnitTests.scala
+++ b/server/src/test/scala/za/co/absa/atum/server/api/repository/PartitioningRepositoryUnitTests.scala
@@ -271,7 +271,7 @@ object PartitioningRepositoryUnitTests extends ZIOSpecDefault with TestData {
             failsWithA[NotFoundDatabaseError]
           )
         },
-        test("Returns expected DatabaseError") {
+        test("Returns expected GeneralDatabaseError") {
           assertZIO(PartitioningRepository.getPartitioningMeasuresById(4L).exit)(
             failsWithA[GeneralDatabaseError]
           )