diff --git a/CMakeLists.txt b/CMakeLists.txt
index a34a67f2..4842b7fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,9 +197,6 @@ if(HNSWLIB_EXAMPLES)
         if(ENABLE_MSAN)
             add_cxx_flags(-fsanitize=memory)
         endif()
-        if(ENABLE_ASAN OR ENABLE_UBSAN)
-            add_cxx_flags(-DHNSWLIB_USE_PREFETCH=0)
-        endif()
 
         add_cxx_flags(-Wall -Wextra -Wpedantic -Werror)
 
diff --git a/hnswlib/hnswalg.h b/hnswlib/hnswalg.h
index eb8dfe20..a21466c2 100644
--- a/hnswlib/hnswalg.h
+++ b/hnswlib/hnswalg.h
@@ -283,8 +283,10 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
 //                    if (candidate_id == 0) continue;
 #ifdef USE_SSE
 #if HNSWLIB_USE_PREFETCH
-                _mm_prefetch((char *) (visited_array + *(datal + j + 1)), _MM_HINT_T0);
-                _mm_prefetch(getDataByInternalId(*(datal + j + 1)), _MM_HINT_T0);
+                if (j + 1 < size) {
+                    _mm_prefetch((char *) (visited_array + *(datal + j + 1)), _MM_HINT_T0);
+                    _mm_prefetch(getDataByInternalId(*(datal + j + 1)), _MM_HINT_T0);
+                }
 #endif
 #endif
                 if (visited_array[candidate_id] == visited_array_tag) continue;
@@ -393,9 +395,11 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
 //                    if (candidate_id == 0) continue;
 #ifdef USE_SSE
 #if HNSWLIB_USE_PREFETCH
-                _mm_prefetch((char *) (visited_array + *(data + j + 1)), _MM_HINT_T0);
-                _mm_prefetch(data_level0_memory_ + (*(data + j + 1)) * size_data_per_element_ + offsetData_,
-                                _MM_HINT_T0);  ////////////
+                if (j + 1 < size) {
+                    _mm_prefetch((char *) (visited_array + *(data + j + 1)), _MM_HINT_T0);
+                    _mm_prefetch(data_level0_memory_ + (*(data + j + 1)) * size_data_per_element_ + offsetData_,
+                                    _MM_HINT_T0);
+                }
 #endif
 #endif
                 if (!(visited_array[candidate_id] == visited_array_tag)) {
@@ -1126,7 +1130,9 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
                     for (int i = 0; i < size; i++) {
 #ifdef USE_SSE
 #if HNSWLIB_USE_PREFETCH
-                        _mm_prefetch(getDataByInternalId(*(datal + i + 1)), _MM_HINT_T0);
+                        if (i + 1 < size) {
+                            _mm_prefetch(getDataByInternalId(*(datal + i + 1)), _MM_HINT_T0);
+                        }
 #endif
 #endif
                         tableint cand = datal[i];