diff --git a/client/src/api-service/api.ts b/client/src/api-service/api.ts
index 579f87a..e75fd90 100644
--- a/client/src/api-service/api.ts
+++ b/client/src/api-service/api.ts
@@ -1,6 +1,10 @@
 import { API_TOKEN } from '../app-constants/app-constants';
 
-const tokenState = localStorage.getItem(API_TOKEN);
+
+function getToken(): string {
+  const tokenState = localStorage.getItem(API_TOKEN);
+  return tokenState ?? '';
+}
 
 /**
  *
@@ -25,7 +29,7 @@ const api = {
       mode: 'cors',
       headers: {
         'Content-Type': 'application/json',
-        Authorization: `Bearer ${tokenState}`
+        Authorization: `Bearer ${getToken()}`
       }
     });
     if (response.ok) {
@@ -42,7 +46,7 @@ const api = {
       mode: 'cors',
       headers: {
         'Content-Type': 'application/json',
-        Authorization: `Bearer ${tokenState}`
+        Authorization: `Bearer ${getToken()}`
       },
       body: JSON.stringify(payload)
     });
@@ -60,7 +64,7 @@ const api = {
       mode: 'cors',
       headers: {
         'Content-Type': 'application/json',
-        Authorization: `Bearer ${tokenState}`
+        Authorization: `Bearer ${getToken()}`
       },
       body: JSON.stringify(payload)
     });
@@ -78,7 +82,7 @@ const api = {
       mode: 'cors',
       headers: {
         'Content-Type': 'application/json',
-        Authorization: `Bearer ${tokenState}`
+        Authorization: `Bearer ${getToken()}`
       }
     });
     if (response.status === 204) {
diff --git a/java-api/src/main/java/br/com/tasknoteapp/java_api/filter/JwtAuthenticationFilter.java b/java-api/src/main/java/br/com/tasknoteapp/java_api/filter/JwtAuthenticationFilter.java
index d888f55..f2097e2 100644
--- a/java-api/src/main/java/br/com/tasknoteapp/java_api/filter/JwtAuthenticationFilter.java
+++ b/java-api/src/main/java/br/com/tasknoteapp/java_api/filter/JwtAuthenticationFilter.java
@@ -40,7 +40,10 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
       return;
     }
 
-    String jwtToken = authorizationHeader.substring(7);
+    String jwtToken = authorizationHeader;
+    if (authorizationHeader.startsWith("Bearer ")) {
+      jwtToken = authorizationHeader.substring(7);
+    }
     String email = jwtService.getEmailFromToken(jwtToken);
 
     if (!Objects.isNull(email)