diff --git a/src/engine/engine_common.c b/src/engine/engine_common.c
index 9b7b885..d2427f6 100644
--- a/src/engine/engine_common.c
+++ b/src/engine/engine_common.c
@@ -607,8 +607,8 @@ int ocf_engine_prepare_clines(struct ocf_request *req)
 	mapped = ocf_engine_is_mapped(req);
 	if (mapped) {
 		lock = lock_clines(req);
-		ocf_hb_req_prot_unlock_rd(req);
 		ocf_engine_set_hot(req);
+		ocf_hb_req_prot_unlock_rd(req);
 		return lock;
 	}
 
@@ -624,6 +624,8 @@ int ocf_engine_prepare_clines(struct ocf_request *req)
 	/* Mapping must be performed holding (at least) hash-bucket write lock */
 	ocf_hb_req_prot_lock_upgrade(req);
 	result = ocf_prepare_clines_miss(req);
+	if (!ocf_req_test_mapping_error(req))
+		ocf_engine_set_hot(req);
 	ocf_hb_req_prot_unlock_wr(req);
 
 	if (ocf_req_test_clean_eviction(req)) {
@@ -631,9 +633,6 @@ int ocf_engine_prepare_clines(struct ocf_request *req)
 				128);
 	}
 
-	if (!ocf_req_test_mapping_error(req))
-		ocf_engine_set_hot(req);
-
 	return result;
 }