diff --git a/src/app/(sidebar)/smart-contracts/contract-explorer/components/ContractInfo.tsx b/src/app/(sidebar)/smart-contracts/contract-explorer/components/ContractInfo.tsx
index d2c5d18d8..0b092fc4c 100644
--- a/src/app/(sidebar)/smart-contracts/contract-explorer/components/ContractInfo.tsx
+++ b/src/app/(sidebar)/smart-contracts/contract-explorer/components/ContractInfo.tsx
@@ -52,7 +52,7 @@ export const ContractInfo = ({
   isLoading,
   isSacType,
 }: {
-  infoData: ContractInfoApiResponse | undefined;
+  infoData: ContractInfoApiResponse | null | undefined;
   contractId: string;
   backendStatus: "healthy" | "unhealthy";
   wasmData: WasmData | null | undefined;
diff --git a/src/query/external/useSEContractInfo.ts b/src/query/external/useSEContractInfo.ts
index ec0ee102b..354d34c3c 100644
--- a/src/query/external/useSEContractInfo.ts
+++ b/src/query/external/useSEContractInfo.ts
@@ -13,9 +13,9 @@ export const useSEContractInfo = ({
   networkId: NetworkType;
   contractId: string;
 }) => {
-  const query = useQuery<ContractInfoApiResponse>({
+  const query = useQuery({
     queryKey: ["useSEContractInfo", networkId, contractId],
-    queryFn: async () => {
+    queryFn: async (): Promise<ContractInfoApiResponse | null> => {
       const network = getStellarExpertNetwork(networkId);
 
       if (!network) {
diff --git a/src/query/external/useSEContractStorage.ts b/src/query/external/useSEContractStorage.ts
index ce76f05a3..35ad2d003 100644
--- a/src/query/external/useSEContractStorage.ts
+++ b/src/query/external/useSEContractStorage.ts
@@ -20,9 +20,9 @@ export const useSEContractStorage = ({
   contractId: string;
   totalEntriesCount: number | undefined;
 }) => {
-  const query = useQuery<ContractStorageResponseItem[] | null>({
+  const query = useQuery({
     queryKey: ["useSEContractStorage", networkId, contractId],
-    queryFn: async () => {
+    queryFn: async (): Promise<ContractStorageResponseItem[] | null> => {
       // No entries
       if (!totalEntriesCount) {
         return null;
diff --git a/src/query/external/useSEContractVersionHistory.ts b/src/query/external/useSEContractVersionHistory.ts
index ebbedb17b..369c9ede4 100644
--- a/src/query/external/useSEContractVersionHistory.ts
+++ b/src/query/external/useSEContractVersionHistory.ts
@@ -15,9 +15,9 @@ export const useSEContractVersionHistory = ({
   networkId: NetworkType;
   contractId: string;
 }) => {
-  const query = useQuery<ContractVersionHistoryResponseItem[]>({
+  const query = useQuery({
     queryKey: ["useSEContractVersionHistory", networkId, contractId],
-    queryFn: async () => {
+    queryFn: async (): Promise<ContractVersionHistoryResponseItem[] | null> => {
       const network = getStellarExpertNetwork(networkId);
 
       if (!network) {
diff --git a/src/query/external/useSEContractWasmBinary.ts b/src/query/external/useSEContractWasmBinary.ts
index e0af387ab..ee61f20d7 100644
--- a/src/query/external/useSEContractWasmBinary.ts
+++ b/src/query/external/useSEContractWasmBinary.ts
@@ -13,9 +13,9 @@ export const useSEContractWasmBinary = ({
   networkId: NetworkType;
   wasmHash: string;
 }) => {
-  const query = useQuery<ArrayBuffer | null>({
+  const query = useQuery({
     queryKey: ["useSEContractWasmBinary", networkId, wasmHash],
-    queryFn: async () => {
+    queryFn: async (): Promise<ArrayBuffer | null> => {
       const network = getStellarExpertNetwork(networkId);
 
       if (!network) {
diff --git a/src/query/external/useSEContractsList.ts b/src/query/external/useSEContractsList.ts
index b64e5b4d4..f4a5a5fbd 100644
--- a/src/query/external/useSEContractsList.ts
+++ b/src/query/external/useSEContractsList.ts
@@ -15,13 +15,13 @@ export const useSEContractsList = ({
   cursor?: string;
   order?: "asc" | "desc";
 }) => {
-  const query = useQuery<{
-    records: ContractListRecord[];
-    prevCursor: string | null;
-    nextCursor: string | null;
-  } | null>({
+  const query = useQuery({
     queryKey: ["useSEContractsList", networkId, cursor, order],
-    queryFn: async () => {
+    queryFn: async (): Promise<{
+      records: ContractListRecord[];
+      prevCursor: string | null;
+      nextCursor: string | null;
+    }> => {
       const network = getStellarExpertNetwork(networkId);
 
       if (!network) {
diff --git a/src/query/useContractClientFromRpc.ts b/src/query/useContractClientFromRpc.ts
index 6db913ca7..ec1d40ff1 100644
--- a/src/query/useContractClientFromRpc.ts
+++ b/src/query/useContractClientFromRpc.ts
@@ -10,9 +10,9 @@ export const useContractClientFromRpc = ({
   networkPassphrase: string;
   rpcUrl: string;
 }) => {
-  const query = useQuery<contract.Client | null>({
+  const query = useQuery({
     queryKey: ["useClientFromRpc", contractId, networkPassphrase, rpcUrl],
-    queryFn: async () => {
+    queryFn: async (): Promise<contract.Client> => {
       try {
         const client = await contract.Client.from({
           contractId,
diff --git a/src/query/useGetContractDataFromRpcById.ts b/src/query/useGetContractDataFromRpcById.ts
index 044cbe198..6b376574c 100644
--- a/src/query/useGetContractDataFromRpcById.ts
+++ b/src/query/useGetContractDataFromRpcById.ts
@@ -16,16 +16,18 @@ export const useGetContractDataFromRpcById = ({
   const execStellarAssetType =
     xdr.ContractExecutableType.contractExecutableStellarAsset().name;
 
-  const query = useQuery<
-    | {
-        contractType: typeof execWasmType | typeof execStellarAssetType | null;
-        wasmHash: string;
-      }
-    | null
-    | undefined
-  >({
+  const query = useQuery({
     queryKey: ["useGetContractDataFromRpcById", contractId, rpcUrl],
-    queryFn: async () => {
+    queryFn: async (): Promise<
+      | {
+          contractType:
+            | typeof execWasmType
+            | typeof execStellarAssetType
+            | null;
+          wasmHash: string;
+        }
+      | null
+    > => {
       if (!contractId || !rpcUrl) {
         return null;
       }
diff --git a/src/query/useGitHubFile.ts b/src/query/useGitHubFile.ts
index b18ea7641..8b9914589 100644
--- a/src/query/useGitHubFile.ts
+++ b/src/query/useGitHubFile.ts
@@ -14,9 +14,9 @@ export const useGitHubFile = ({
   file: string;
   isActive: boolean;
 }) => {
-  const query = useQuery<string | null>({
+  const query = useQuery({
     queryKey: ["useGitHubFile", repo, path, file],
-    queryFn: async () => {
+    queryFn: async (): Promise<string | null> => {
       if (!repo || !path || !file) {
         return null;
       }
diff --git a/src/query/useGitHubReadmeText.ts b/src/query/useGitHubReadmeText.ts
index 88cec667a..34a05fb0c 100644
--- a/src/query/useGitHubReadmeText.ts
+++ b/src/query/useGitHubReadmeText.ts
@@ -12,9 +12,9 @@ export const useGitHubReadmeText = ({
   commit: string;
   isActive: boolean;
 }) => {
-  const query = useQuery<string | null>({
+  const query = useQuery({
     queryKey: ["useGitHubReadmeText", repo, commit],
-    queryFn: async () => {
+    queryFn: async (): Promise<string | null> => {
       if (!repo || !commit) {
         return null;
       }
diff --git a/src/query/useMaintenanceData.ts b/src/query/useMaintenanceData.ts
index fc40a1c61..bb27a0401 100644
--- a/src/query/useMaintenanceData.ts
+++ b/src/query/useMaintenanceData.ts
@@ -2,15 +2,19 @@ import { useQuery } from "@tanstack/react-query";
 import { StatusPageScheduled } from "@/types/types";
 
 export const useMaintenanceData = () => {
-  const query = useQuery<StatusPageScheduled[]>({
+  const query = useQuery({
     queryKey: ["maintenanceData"],
-    queryFn: async () => {
+    queryFn: async (): Promise<StatusPageScheduled[]> => {
       try {
         const scheduleResponse = await fetch(
           "https://9sl3dhr1twv1.statuspage.io/api/v2/summary.json",
         );
         const scheduleResponseJson = await scheduleResponse.json();
 
+        if (!Array.isArray(scheduleResponseJson.scheduled_maintenances)) {
+          throw new Error("Failed to fetch testnet reset date.");
+        }
+
         return scheduleResponseJson.scheduled_maintenances;
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
diff --git a/src/query/useWasmBinaryFromRpc.ts b/src/query/useWasmBinaryFromRpc.ts
index ec0f9d742..6971fd599 100644
--- a/src/query/useWasmBinaryFromRpc.ts
+++ b/src/query/useWasmBinaryFromRpc.ts
@@ -17,9 +17,9 @@ export const useWasmBinaryFromRpc = ({
   isActive: boolean;
   headers?: NetworkHeaders;
 }) => {
-  const query = useQuery<Buffer | null>({
+  const query = useQuery({
     queryKey: ["useWasmBinaryFromRpc", wasmHash, rpcUrl],
-    queryFn: async () => {
+    queryFn: async (): Promise<Buffer | null> => {
       if (!wasmHash || !rpcUrl) {
         return null;
       }
diff --git a/src/query/useWasmGitHubAttestation.ts b/src/query/useWasmGitHubAttestation.ts
index 180eb5468..cda7f9af3 100644
--- a/src/query/useWasmGitHubAttestation.ts
+++ b/src/query/useWasmGitHubAttestation.ts
@@ -17,9 +17,9 @@ export const useWasmGitHubAttestation = ({
   isActive: boolean;
   headers?: NetworkHeaders;
 }) => {
-  const query = useQuery<WasmData | null | undefined>({
+  const query = useQuery({
     queryKey: ["useWasmGitHubAttestation", wasmHash, rpcUrl],
-    queryFn: async () => {
+    queryFn: async (): Promise<WasmData | null> => {
       if (!wasmHash || !rpcUrl) {
         return null;
       }