diff --git a/backend/src/api/mining/mining-routes.ts b/backend/src/api/mining/mining-routes.ts
index c9ace12e5..ac4b82363 100644
--- a/backend/src/api/mining/mining-routes.ts
+++ b/backend/src/api/mining/mining-routes.ts
@@ -251,8 +251,12 @@ class MiningRoutes {
   private async $getHeightFromTimestamp(req: Request, res: Response) {
     try {
       const timestamp = parseInt(req.params.timestamp, 10);
+      // This will prevent people from entering milliseconds etc.
+      // Block timestamps are allowed to be up to 2 hours off, so 24 hours
+      // will never put the maximum value before the most recent block
+      const nowPlus1day = Math.floor(Date.now() / 1000) + 60 * 60 * 24;
       // Prevent non-integers that are not seconds
-      if (!/^[1-9][0-9]*$/.test(req.params.timestamp) || timestamp >= 2 ** 32) {
+      if (!/^[1-9][0-9]*$/.test(req.params.timestamp) || timestamp > nowPlus1day) {
         throw new Error(`Invalid timestamp, value must be Unix seconds`);
       }
       const result = await BlocksRepository.$getBlockHeightFromTimestamp(
diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
index c5a1a2ae4..590e9de37 100644
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -399,17 +399,17 @@ class BlocksRepository {
    */
   public async $getBlockHeightFromTimestamp(
     timestamp: number,
-  ): Promise<{ height: number; timestamp: number }> {
+  ): Promise<{ height: number; hash: string; timestamp: number }> {
     try {
       // Get first block at or after the given timestamp
-      const query = `SELECT height, blockTimestamp as timestamp FROM blocks
-        WHERE blockTimestamp >= FROM_UNIXTIME(?)
-        ORDER BY blockTimestamp ASC
+      const query = `SELECT height, hash, blockTimestamp as timestamp FROM blocks
+        WHERE blockTimestamp <= FROM_UNIXTIME(?)
+        ORDER BY blockTimestamp DESC
         LIMIT 1`;
       const params = [timestamp];
       const [rows]: any[][] = await DB.query(query, params);
       if (rows.length === 0) {
-        throw new Error(`No block was found after timestamp ${timestamp}`);
+        throw new Error(`No block was found before timestamp ${timestamp}`);
       }
 
       return rows[0];