diff --git a/server.hpp b/server.hpp
index 0b2afde..6c7e9a9 100644
--- a/server.hpp
+++ b/server.hpp
@@ -152,11 +152,6 @@ private:
 
 		Response response;
 
-		if (static_handler && static_handler->handle(req, response)) {
-			send_response(client_fd, response, req.version);
-			return;
-		}
-
 		if (router.handle(req, response)) {
 			std::string_view existing_id = sessions.extract_session_id(req);
 			std::string session_id = existing_id.empty() ? 
@@ -164,11 +159,17 @@ private:
 			
 			set_session_cookie(response, session_id);
 			send_response(client_fd, response, req.version);
-		} else {
-			response.status = 404;
-			response.set_text("Not Found");
-			send_response(client_fd, response, req.version);
+			return;
 		}
+
+		if (static_handler && static_handler->handle(req, response)) {
+			send_response(client_fd, response, req.version);
+			return;
+		}
+
+		response.status = 404;
+		response.set_text("Not Found");
+		send_response(client_fd, response, req.version);
 	}
 
 		void set_session_cookie(Response& response, const std::string& session_id) {