diff --git a/bsrc/translate_browse_path_result_i.imp b/bsrc/translate_browse_path_result_i.imp
index 671e807e10456c493f86e291472161ce95aab51f..120eb3f155c0976d7281a86288e9da82ec94134c 100644
--- a/bsrc/translate_browse_path_result_i.imp
+++ b/bsrc/translate_browse_path_result_i.imp
@@ -367,7 +367,7 @@ LOCAL_OPERATIONS
             nbReferences : NAT &
             nbReferences <= k_n_BrowseTarget_max &
 
-            (statusCode_operation = e_sc_ok => isBrowseResultComputed = TRUE) &
+            isBrowseResultComputed = bool(statusCode_operation = e_sc_ok) &
 
             d_inv_browse_result_out &
             d_inv_browse_result_status
@@ -756,6 +756,9 @@ OPERATIONS
             l_browse_statusCode,
             l_continuationPoint,
             nbReferences <-- compute_browse_result;
+            IF l_browse_statusCode = e_sc_bad_no_continuation_points THEN
+                clear_browse_result
+            END;
             clear_browse_value_context;
             statusCode_operation <-- get_translateStatus_from_browseStatus(l_browse_statusCode)
         END
diff --git a/src/ClientServer/services/bgenc/translate_browse_path_result.c b/src/ClientServer/services/bgenc/translate_browse_path_result.c
index d64674a364d6d7a93e220956f883c93daa185af9..c44d12747d7ebfca07b76522b8a4e04f40fdb55a 100644
--- a/src/ClientServer/services/bgenc/translate_browse_path_result.c
+++ b/src/ClientServer/services/bgenc/translate_browse_path_result.c
@@ -21,7 +21,7 @@
 
  File Name            : translate_browse_path_result.c
 
- Date                 : 07/05/2024 09:45:49
+ Date                 : 17/05/2024 13:08:44
 
  C Translator Version : tradc Java V1.2 (06/02/2022)
 
@@ -302,6 +302,9 @@ void translate_browse_path_result__compute_browse_result_from_source(
          browse_treatment__compute_browse_result(&translate_browse_path_result__l_browse_statusCode,
             &translate_browse_path_result__l_continuationPoint,
             translate_browse_path_result__nbReferences);
+         if (translate_browse_path_result__l_browse_statusCode == constants_statuscodes_bs__e_sc_bad_no_continuation_points) {
+            browse_treatment__clear_browse_result();
+         }
          browse_treatment__clear_browse_value_context();
          translate_browse_path_result__get_translateStatus_from_browseStatus(translate_browse_path_result__l_browse_statusCode,
             translate_browse_path_result__statusCode_operation);