diff --git a/backend/src/main/java/services/shay/shortlink/ShortLinkController.java b/backend/src/main/java/services/shay/shortlink/ShortLinkController.java
index 216341a..7872752 100644
--- a/backend/src/main/java/services/shay/shortlink/ShortLinkController.java
+++ b/backend/src/main/java/services/shay/shortlink/ShortLinkController.java
@@ -20,7 +20,7 @@ public class ShortLinkController {
     }
 
     @GetMapping("/{code}")
-    public ResponseEntity<Void> redirectToUrl(@PathVariable String code) {
+    public ResponseEntity<String> redirectToUrl(@PathVariable String code) {
         ShortLink sl = shortLinkRepository.findByCode(code).orElse(null);
         if (sl != null) {
             sl.setClicks(sl.getClicks() + 1);
@@ -30,7 +30,7 @@ public class ShortLinkController {
                     .location(URI.create(sl.getUrl()))
                     .build();
         }
-        return ResponseEntity.notFound().build();
+        return ResponseEntity.status(404).body("The requested link was not found on the server");
     }
 
     @PostMapping
diff --git a/frontend/app/manage/[id]/page.tsx b/frontend/app/manage/[id]/page.tsx
index 14ff2c4..c1c9d88 100644
--- a/frontend/app/manage/[id]/page.tsx
+++ b/frontend/app/manage/[id]/page.tsx
@@ -2,7 +2,7 @@
 
 import { deleteLink, getLinkInfo } from "@/app/utils/api";
 import { Clipboard } from "lucide-react";
-import { useParams } from "next/navigation";
+import { redirect, useParams } from "next/navigation";
 import { useEffect, useState } from "react";
 
 export default function Home() {
@@ -28,8 +28,7 @@ export default function Home() {
     setLoading(true);
     try {
       await deleteLink(params.id?.toString() || "");
-      setSuccessMessage("Link deleted!");
-      setErrorMessage(null);
+      redirect("/");
     } catch (err) {
       console.error(err);
       setErrorMessage("Failed to delete the link. Please try again.");