diff --git a/Server/middleware/verifyJWT.js b/Server/middleware/verifyJWT.js
index 8e2e88b6f..fa1fc3afa 100644
--- a/Server/middleware/verifyJWT.js
+++ b/Server/middleware/verifyJWT.js
@@ -38,6 +38,11 @@ const verifyJWT = (req, res, next) => {
   const { jwtSecret } = req.settingsService.getSettings();
   jwt.verify(parsedToken, jwtSecret, (err, decoded) => {
     if (err) {
+      if (err.name === "TokenExpiredError") {
+        res
+          .status(401)
+          .json({ success: false, msg: errorMessages.EXPIRED_AUTH_TOKEN });
+      }
       return res
         .status(401)
         .json({ success: false, msg: errorMessages.INVALID_AUTH_TOKEN });
diff --git a/Server/utils/messages.js b/Server/utils/messages.js
index c1e4d887b..f9d345c74 100644
--- a/Server/utils/messages.js
+++ b/Server/utils/messages.js
@@ -12,6 +12,7 @@ const errorMessages = {
   UNKNOWN_SERVICE: "Unknown service",
   NO_AUTH_TOKEN: "No auth token provided",
   INVALID_AUTH_TOKEN: "Invalid auth token",
+  EXPIRED_AUTH_TOKEN: "Token expired",
 
   //Ownership Middleware
   VERIFY_OWNER_NOT_FOUND: "Document not found",
@@ -93,7 +94,8 @@ const successMessages = {
 
   //Maintenance Window Controller
   MAINTENANCE_WINDOW_CREATE: "Maintenance Window created successfully",
-  MAINTENANCE_WINDOW_GET_BY_USER: "Got Maintenance Windows by User successfully",
+  MAINTENANCE_WINDOW_GET_BY_USER:
+    "Got Maintenance Windows by User successfully",
 
   //Ping Operations
   PING_SUCCESS: "Success",