diff --git a/src/index.ts b/src/index.ts
index 2782c51..eb4ba88 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -156,11 +156,11 @@ export function generateApp() {
         return JSONAPIResponseWrapper<SingleBlocknumQueryResponseSchema>(c, await currentBlocknumQuery(chain));
     });
 
-    /*app.openapi(routes.finalBlocknumQueryRoute, async (c) => {
+    app.openapi(routes.finalBlocknumQueryRoute, async (c) => {
         const { chain } = c.req.valid('param') as BlockchainSchema;
 
         return JSONAPIResponseWrapper<SingleBlocknumQueryResponseSchema>(c, await finalBlocknumQuery(chain));
-    });*/
+    });
 
     return app;
 }
diff --git a/src/queries.ts b/src/queries.ts
index a6c243c..f30de63 100644
--- a/src/queries.ts
+++ b/src/queries.ts
@@ -79,14 +79,13 @@ export async function currentBlocknumQuery(chain: string) {
 }
 
 export async function finalBlocknumQuery(chain: string) {
-    /*const query = `SELECT MAX(block_number) as final FROM ${config.table} GROUP BY chain HAVING (chain == '${chain}')`;
+    const query = `SELECT MAX(block_number) as final FROM ${config.table} GROUP BY chain HAVING (chain == '${chain}') AND (final_block == true)`;
     const json = await makeQuery(query);
 
     return SingleBlocknumQueryResponseSchema.parse({
-        chain
+        chain,
         block_number: Object.values(json as JSONObjectEachRow)[0].final,
     });
-    */
 }
 
 export async function supportedChainsQuery() {
diff --git a/src/tests/index.spec.ts b/src/tests/index.spec.ts
index cdaee11..556d61c 100644
--- a/src/tests/index.spec.ts
+++ b/src/tests/index.spec.ts
@@ -153,7 +153,7 @@ describe('Blocknum query page (/{chain}/blocknum?timestamp=<timestamp>)', () =>
     });
 });
 
-describe.each(['current'/*, 'final'*/])('Single blocknum query page (/{chain}/%s)', (query_type: string) => {
+describe.each(['current', 'final'])('Single blocknum query page (/{chain}/%s)', (query_type: string) => {
     it('Should fail on non-valid chains', async () => {
         const res = await app.request(`/dummy/${query_type}`);
         expect(res.status).toBe(422);