diff --git a/http/http_connection.hpp b/http/http_connection.hpp
index d1266f3..187a8a4 100644
--- a/http/http_connection.hpp
+++ b/http/http_connection.hpp
@@ -387,6 +387,12 @@
             asyncResp->res.setCompleteRequestHandler(nullptr);
             return;
         }
+        std::string_view expected =
+            req->getHeaderValue(boost::beast::http::field::if_none_match);
+        if (!expected.empty())
+        {
+            res.setExpectedHash(expected);
+        }
         handler->handle(thisReq, asyncResp);
     }
 
@@ -451,6 +457,9 @@
             res.setCompleteRequestHandler(nullptr);
             return;
         }
+
+        res.setHashAndHandleNotModified();
+
         if (res.body().empty() && !res.jsonValue.empty())
         {
             using http_helpers::ContentType;