diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c
index 36ecdce545c8cc16395f8a954ffa0d8873f8ed55..58e0d0539476eb802b9ed66ca1320fd110d72656 100644
--- a/innobase/row/row0sel.c
+++ b/innobase/row/row0sel.c
@@ -2700,8 +2700,10 @@ row_search_for_mysql(
 
 			goto next_rec;
 		}
-
-		rec = clust_rec;
+		
+		if (prebuilt->need_to_access_clustered) {
+		        rec = clust_rec;
+		}
 	}
 
 	/* We found a qualifying row */