diff --git a/server/src/main/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImpl.scala b/server/src/main/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImpl.scala
index c1ecc14..bc8f082 100644
--- a/server/src/main/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImpl.scala
+++ b/server/src/main/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImpl.scala
@@ -3,7 +3,11 @@ package com.jackpf.locationhistory.server.grpc
 import com.jackpf.locationhistory.admin_service.*
 import com.jackpf.locationhistory.admin_service.AdminServiceGrpc.AdminService
 import com.jackpf.locationhistory.server.errors.ApplicationErrors.*
-import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.{DefaultUser, TokenDuration}
+import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.{
+  DefaultLocationLimit,
+  DefaultUser,
+  TokenDuration
+}
 import com.jackpf.locationhistory.server.grpc.interceptors.TokenService
 import com.jackpf.locationhistory.server.model.DeviceId
 import com.jackpf.locationhistory.server.repo.{DeviceRepo, LocationRepo}
@@ -18,6 +22,8 @@ import scala.util.{Failure, Success}
 object AdminServiceImpl {
   val DefaultUser: String = "admin"
   val TokenDuration: Long = 3600
+
+  val DefaultLocationLimit: Option[Int] = Some(1000)
 }
 
 class AdminServiceImpl(
@@ -80,7 +86,10 @@ class AdminServiceImpl(
       request: ListLocationsRequest
   ): Future[ListLocationsResponse] = {
     for {
-      locations <- locationRepo.getForDevice(DeviceId(request.deviceId), limit = None)
+      locations <- locationRepo.getForDevice(
+        DeviceId(request.deviceId),
+        limit = DefaultLocationLimit
+      )
     } yield ListLocationsResponse(locations.map(_.toProto))
   }
 
diff --git a/server/src/test/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImplTest.scala b/server/src/test/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImplTest.scala
index 3c93b9f..4910d7a 100644
--- a/server/src/test/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImplTest.scala
+++ b/server/src/test/scala/com/jackpf/locationhistory/server/grpc/AdminServiceImplTest.scala
@@ -26,8 +26,11 @@ import org.specs2.concurrent.ExecutionEnv
 
 import scala.concurrent.Future
 import scala.util.{Failure, Success, Try}
-import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.DefaultUser
-import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.TokenDuration
+import com.jackpf.locationhistory.server.grpc.AdminServiceImpl.{
+  DefaultLocationLimit,
+  DefaultUser,
+  TokenDuration
+}
 
 class AdminServiceImplTest(implicit ee: ExecutionEnv)
     extends DefaultSpecification
@@ -226,7 +229,8 @@ class AdminServiceImplTest(implicit ee: ExecutionEnv)
         lazy val deviceId: String = "123"
 
         lazy val getResponse: Future[Vector[model.StoredLocation]]
-        when(locationRepo.getForDevice(DeviceId(deviceId), limit = None)).thenReturn(getResponse)
+        when(locationRepo.getForDevice(DeviceId(deviceId), limit = DefaultLocationLimit))
+          .thenReturn(getResponse)
 
         val request: ListLocationsRequest = ListLocationsRequest(deviceId = deviceId)
         lazy val result: Future[ListLocationsResponse] = adminService.listLocations(request)