diff --git a/assets/SpinIcon.js b/assets/SpinIcon.js
index e36ac4b..7561da4 100644
--- a/assets/SpinIcon.js
+++ b/assets/SpinIcon.js
@@ -3,7 +3,7 @@ import React from "react";
 export const SpinIcon = ({ strokeWidth = 1.5, ...otherProps }) => (
   <svg
     aria-hidden="true"
-    class="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
+    className="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
     viewBox="0 0 100 101"
     fill="none"
     focusable="false"
diff --git a/pages/deputado-federal/[name].js b/pages/deputado-federal/[name].js
index f6d163a..001244c 100644
--- a/pages/deputado-federal/[name].js
+++ b/pages/deputado-federal/[name].js
@@ -28,8 +28,6 @@ import {
   formatCPFCNPJ,
   formatDate,
   formatPhoneNumberDf,
-  fetchVideos,
-  propertyValuesArray,
 } from "../../utils";
 
 import { defaultSeoConfig } from "../../seoConfig";
@@ -60,47 +58,6 @@ export async function getServerSideProps(ctx) {
     const politician = await api.get(`/deputados/${id}`);
     const experience = await api.get(`/deputados/${id}/ocupacoes`);
 
-    //get videos
-    try {
-      const speeches = await axios.get(
-        `https://pub-ef5d1d80d62c44a1a00e2d05a2d5b85c.r2.dev/${name}.json`,
-      );
-      data = { ...data, speeches: speeches?.data ? speeches?.data : [] };
-    } catch (error) {
-      console.log("fail to get videos");
-    }
-
-    //get gabinete
-    try {
-      const gabinete = await axios.get(
-        `https://pub-bfddf9199db94ff8b19b7d931e548c52.r2.dev/${name}.json`,
-      );
-      data = { ...data, gabinete: gabinete?.data ? gabinete?.data : [] };
-    } catch (error) {
-      console.log("fail to get gabinete");
-    }
-
-    if (data?.speeches?.length > 0) {
-      fetchVideos(data?.speeches);
-      try {
-        let eventsArray = propertyValuesArray(
-          data?.speeches || [],
-          "evento_id",
-          "number",
-        );
-        eventsArray = eventsArray.map((id) => `id=${id}`).join("&");
-        const events = await api.get(
-          `/eventos?${eventsArray}&ordem=ASC&ordenarPor=dataHoraInicio`,
-        );
-        data = {
-          ...data,
-          events: events.data,
-        };
-      } catch (error) {
-        console.log("fail to get the documents");
-      }
-    }
-
     let monthlyGabineteMoney = null;
     const monthNumber = (new Date().getMonth() + 1).toString().padStart(2, "0");
 
@@ -184,29 +141,70 @@ ${total} em ${seoDates.month} de ${
     title: title,
   };
 
-  return { props: { data } };
+  return { props: { data, routeParam: name } };
 }
 
-export default function FederalDeputy({ data }) {
+export default function FederalDeputy({ data, routeParam }) {
   const router = useRouter();
-  const [isLoading, setIsLoading] = useState(true);
 
   const [currentDate, setCurrentDate] = useState({
     numericMonth: "",
     fullMonth: "",
     year: "",
   });
-  const [selectTab, setSelectedTab] = useState("gastos");
+
+  const [selectTab, setSelectedTab] = useState("despesas");
 
   const { isOpen, onOpen, onOpenChange } = useDisclosure();
   const [openDocument, setOpenDocument] = useState(null);
 
+  const [isExpensesLoading, setIsExpensesLoading] = useState(true);
+
+  const [isSpeechesLoading, setIsSpeechesLoading] = useState(true);
+  const [speeches, setSpeeches] = useState([]);
+  const [speechesError, setSpeechesError] = useState(null);
+
+  const [isGabineteLoading, setIsGabineteLoading] = useState(true);
+  const [gabinete, setGabinete] = useState([]);
+  const [gabineteError, setGabineteError] = useState(null);
+
   useEffect(() => {
-    router.events.on("routeChangeComplete", () => setIsLoading(false));
+    router.events.on("routeChangeComplete", () => setIsExpensesLoading(false));
   }, [router.events]);
+
   useEffect(() => {
-    router.isReady && setIsLoading(false);
-  }, []);
+    router.isReady && setIsExpensesLoading(false);
+    const speechesAndGabineteRequestsPromises =
+      getSpeechesAndGabineteRequestsPromises(
+        routeParam,
+        setIsSpeechesLoading,
+        setIsGabineteLoading,
+      );
+
+    (async () => {
+      const [speechesResponse, gabineteResponse] = await Promise.allSettled(
+        speechesAndGabineteRequestsPromises,
+      );
+
+      if (speechesResponse.status === "rejected") {
+        setSpeechesError(speechesResponse.reason);
+        console.error("failed to get speeches videos");
+      } else {
+        setSpeeches(speechesResponse.value.data);
+      }
+
+      if (gabineteResponse.status === "rejected") {
+        setGabineteError(gabineteResponse.reason);
+        console.error("failed to get cabinet data");
+      } else {
+        setGabinete(gabineteResponse.data);
+      }
+    })();
+
+    return () => {
+      abortReqController.abort();
+    };
+  }, [routeParam, router.isReady]);
 
   const handleOpenExpense = (document) => {
     onOpen();
@@ -216,7 +214,7 @@ export default function FederalDeputy({ data }) {
   };
   //testing purposes
   const handleDateChange = (newDate) => {
-    setIsLoading(true);
+    setIsExpensesLoading(true);
     setCurrentDate(newDate);
   };
 
@@ -357,10 +355,13 @@ export default function FederalDeputy({ data }) {
                   )}
                   <MonthYear onDateChange={handleDateChange} />
 
-                  {(!isLoading && data?.expenses?.length > 0) && (
+                  {!isExpensesLoading && data?.expenses?.length > 0 && (
                     <Fragment>
                       <Divider className="my-5" />
-                      <ExpenseCategories expenses={data.expenses} isLoading={isLoading} />
+                      <ExpenseCategories
+                        expenses={data.expenses}
+                        isLoading={isExpensesLoading}
+                      />
                     </Fragment>
                   )}
                   <Divider className="my-5" />
@@ -386,7 +387,7 @@ export default function FederalDeputy({ data }) {
                   {data?.expenses?.length > 0 && (
                     <>
                       <ol className="relative border-l border-gray-200 dark:border-gray-700 ">
-                        {isLoading ? (
+                        {isExpensesLoading ? (
                           <div
                             className="flex flex-1 flex-col items-center justify-center mt-8"
                             role="status"
@@ -403,10 +404,10 @@ export default function FederalDeputy({ data }) {
                                 new Date(b.dataDocumento) -
                                 new Date(a.dataDocumento),
                             )
-                            .map((expense) => {
+                            .map((expense, index) => {
                               return (
                                 <ExpenseItem
-                                  key={expense.id}
+                                  key={index}
                                   value={expense.valorLiquido}
                                   date={expense.dataDocumento}
                                   type={expense.tipoDespesa}
@@ -455,42 +456,65 @@ export default function FederalDeputy({ data }) {
                     </div>
 
                     <div className="grid grid-cols-1 md:grid-cols-5 gap-4 mb-2 ">
-                      {data?.gabinete?.active_secretaries?.map((secretary) => {
-                        return (
-                          <>
-                            <div className="col-span-1 p-2 border-b md:border-b-0 border-gray-300">
-                              <span className="md:hidden font-bold">
-                                Nome:{" "}
-                              </span>
-                              {secretary?.name}
-                            </div>
-                            <div className="col-span-1 p-2 border-b md:border-b-0 border-gray-300">
-                              <span className="md:hidden font-bold">
-                                Grupo funcional:
-                              </span>
-                              {secretary?.group}
-                            </div>
-                            <div className="col-span-1 p-2 border-b md:border-b-0 border-gray-300">
-                              <span className="md:hidden font-bold">
-                                Cargo:{" "}
-                              </span>
-                              {secretary?.role}
-                            </div>
-                            <div className="col-span-1 p-2 border-b md:border-b-0 border-gray-300">
-                              <span className="md:hidden font-bold">
-                                Período de exercício:{" "}
-                              </span>{" "}
-                              {secretary?.period}
-                            </div>
-                            <div className="col-span-1 p-2 border-gray-300">
-                              <span className="md:hidden font-bold">
-                                Remuneração mensal:{" "}
-                              </span>
-                              Em breve
-                            </div>
-                          </>
-                        );
-                      })}
+                      {isGabineteLoading ? (
+                        <div
+                          className="flex flex-1 flex-col items-center justify-center"
+                          role="status"
+                        >
+                          <SpinIcon />
+                          <h2 className="text-1xl font-bold mb-4">
+                            Buscando dados do gabinete do parlamentar, aguarde
+                            um momento.
+                          </h2>
+                        </div>
+                      ) : (
+                        <Fragment>
+                          {gabineteError && (
+                            <small className="text-start">
+                              Houve um erro ao buscar dados do gabinete
+                            </small>
+                          )}
+                          {!gabineteError &&
+                            gabinete.active_secretaries?.map(
+                              (secretary, index) => {
+                                return (
+                                  <Fragment key={index}>
+                                    <div className="col-span-1 p-2 border-b md:border-b-0 border-gray-300">
+                                      <span className="md:hidden font-bold">
+                                        Nome:{" "}
+                                      </span>
+                                      {secretary?.name}
+                                    </div>
+                                    <div className="col-span-1 p-2 border-b md:border-b-0 border-gray-300">
+                                      <span className="md:hidden font-bold">
+                                        Grupo funcional:
+                                      </span>
+                                      {secretary?.group}
+                                    </div>
+                                    <div className="col-span-1 p-2 border-b md:border-b-0 border-gray-300">
+                                      <span className="md:hidden font-bold">
+                                        Cargo:{" "}
+                                      </span>
+                                      {secretary?.role}
+                                    </div>
+                                    <div className="col-span-1 p-2 border-b md:border-b-0 border-gray-300">
+                                      <span className="md:hidden font-bold">
+                                        Período de exercício:{" "}
+                                      </span>{" "}
+                                      {secretary?.period}
+                                    </div>
+                                    <div className="col-span-1 p-2 border-gray-300">
+                                      <span className="md:hidden font-bold">
+                                        Remuneração mensal:{" "}
+                                      </span>
+                                      Em breve
+                                    </div>
+                                  </Fragment>
+                                );
+                              },
+                            )}
+                        </Fragment>
+                      )}
                     </div>
                   </div>
                 </CardBody>
@@ -499,41 +523,60 @@ export default function FederalDeputy({ data }) {
             <Tab key="videos" title="Videos">
               <Card>
                 <CardBody>
-                  {data?.speeches?.length === 0 && (
-                    <>
-                      <small className="text-start">
-                        Não existe vídeos para esse parlamentar
-                      </small>
-                    </>
+                  {speechesError && (
+                    <small className="text-start">
+                      Houve um erro ao buscar os vídeos para esse parlamentar
+                    </small>
                   )}
-                  {data?.speeches?.length > 0 && (
-                    <>
-                      <div
-                        className="bg-gray-100 mb-5 border-l-4 border-gray-300 text-dark-700 p-4 rounded-lg"
-                        role="alert"
-                      >
-                        Os vídeos abaixo foram capturados pela página do
-                        deputado no site da câmara dos deputados, se não
-                        conseguir visualizar aqui clique no link que redireciona
-                        para a página da câmara.
-                      </div>
-                      <ol className="relative border-l border-gray-200 dark:border-gray-700">
-                        {data?.speeches.map((speeche) => {
-                          return (
-                            <EventItem
-                              key={speeche.evento_id}
-                              id={speeche.evento_id}
-                              title={speeche.event_title}
-                              date={speeche.date}
-                              time={speeche.time}
-                              place={speeche.place}
-                              videos={speeche.video_links}
-                              name={data?.politician?.ultimoStatus?.nome}
-                            />
-                          );
-                        })}
-                      </ol>
-                    </>
+                  {isSpeechesLoading ? (
+                    <div
+                      className="flex flex-1 flex-col items-center justify-center"
+                      role="status"
+                    >
+                      <SpinIcon />
+                      <h2 className="text-1xl font-bold mb-4">
+                        Buscando videos, aguarde um momento.
+                      </h2>
+                    </div>
+                  ) : (
+                    <Fragment>
+                      {!speechesError && speeches.length === 0 && (
+                        <>
+                          <small className="text-start">
+                            Não existe vídeos para esse parlamentar
+                          </small>
+                        </>
+                      )}
+                      {!speechesError && speeches.length > 0 && (
+                        <>
+                          <div
+                            className="bg-gray-100 mb-5 border-l-4 border-gray-300 text-dark-700 p-4 rounded-lg"
+                            role="alert"
+                          >
+                            Os vídeos abaixo foram capturados pela página do
+                            deputado no site da câmara dos deputados, se não
+                            conseguir visualizar aqui clique no link que
+                            redireciona para a página da câmara.
+                          </div>
+                          <ol className="relative border-l border-gray-200 dark:border-gray-700">
+                            {speeches.map((speeche) => {
+                              return (
+                                <EventItem
+                                  key={speeche.evento_id}
+                                  id={speeche.evento_id}
+                                  title={speeche.event_title}
+                                  date={speeche.date}
+                                  time={speeche.time}
+                                  place={speeche.place}
+                                  videos={speeche.video_links}
+                                  name={data?.politician?.ultimoStatus?.nome}
+                                />
+                              );
+                            })}
+                          </ol>
+                        </>
+                      )}
+                    </Fragment>
                   )}
                 </CardBody>
               </Card>
@@ -853,3 +896,35 @@ export default function FederalDeputy({ data }) {
     </>
   );
 }
+
+function getSpeechesAndGabineteRequestsPromises(
+  routeParam,
+  setIsSpeechesLoading,
+  setIsGabineteLoading,
+) {
+  const abortReqController = new AbortController();
+  const abortReqSignal = abortReqController.signal;
+
+  const requestsPromises = [
+    // get videos
+    axios
+      .get(
+        `https://pub-ef5d1d80d62c44a1a00e2d05a2d5b85c.r2.dev/${routeParam}.json`,
+        { signal: abortReqSignal },
+      )
+      .finally(() => {
+        setIsSpeechesLoading(false);
+      }),
+    // get gabinete (Adjust CORS policy from R2)
+    axios
+      .get(
+        `https://pub-bfddf9199db94ff8b19b7d931548c52.r2.dev/${routeParam}.json`,
+        { sginal: abortReqSignal },
+      )
+      .finally(() => {
+        setIsGabineteLoading(false);
+      }),
+  ];
+
+  return requestsPromises;
+}
diff --git a/utils/index.js b/utils/index.js
index 2b12316..4dbc8c0 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -142,27 +142,6 @@ export function checkNullObject(obj) {
   return true;
 }
 
-export function propertyValuesArray(arr, propertyKey, type) {
-  if (!Array.isArray(arr)) {
-    throw new TypeError("First argument must be an array");
-  }
-  if (typeof propertyKey !== "string") {
-    throw new TypeError("Second argument must be a string");
-  }
-
-  return arr
-    .map((obj) => {
-      if (obj && typeof obj === "object" && obj.hasOwnProperty(propertyKey)) {
-        if (type === "number") {
-          return Number(obj[propertyKey]);
-        }
-        return String(obj[propertyKey]);
-      }
-      return null;
-    })
-    .filter((value) => value !== null);
-}
-
 export function findFirstMp4Url(data) {
   for (let i = 0; i < data.length; i++) {
     const videoLinks = data[i].video_links;
@@ -177,35 +156,6 @@ export function findFirstMp4Url(data) {
   return null;
 }
 
-//this function is needed to be called in order to bypass Camara's media provider (.mp4 url)
-export async function fetchVideos(video_links) {
-  video_links.forEach((item) => {
-    if (Array.isArray(item.video_links) && item.video_links.length > 0) {
-      item.video_links.forEach(async (videoLink) => {
-        const url = `https://www.camara.leg.br/evento-legislativo/${item.evento_id}/?${videoLink.video_param}&trechosOrador=${item.deputado}&crawl=no`;
-
-        setTimeout(async () => {
-          await fetch(url)
-            .then((response) => {
-              console.log("tetando pegar o video ===> ".url);
-
-              if (!response.ok) {
-                console.log("Network response was not ok ===> ".url);
-              }
-              return response.text();
-            })
-            .then((data) => {
-              console.log("processou ==> ", url);
-            })
-            .catch((error) => {
-              console.log("erro fetching response was not ok ===> ".url);
-            });
-        }, 249);
-      });
-    }
-  });
-}
-
 export function getCapitalizedPhrase(phrase) {
   const wordsFromPhrase = phrase.split(" ");