diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs
index 7501170efb7..14e6b8cb07e 100644
--- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs
+++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs
@@ -98,17 +98,17 @@ export const <%= entityReactName %> = (props: I<%= entityReactName %>Props) => {
   };
   <%_ } _%>
 
+  <%_ if (pagination === 'no' || pagination === 'infinite-scroll') { _%>
   useEffect(() => {
     <%_ if (pagination !== 'no') { _%>
       <%_ if (pagination === 'infinite-scroll') { _%>
     resetAll();
-      <%_ } else { _%>
-    getAllEntities();
       <%_ } _%>
     <%_ } else { _%>
     props.getEntities();
     <%_ } _%>
-  }, []);
+  }, [<%_ if (searchEngine === 'elasticsearch' && pagination === 'no') { _%>search<%_ } _%>]);
+  <%_ } _%>
 
   <%_ if (pagination === 'infinite-scroll') { _%>
   useEffect(() => {
@@ -119,12 +119,6 @@ export const <%= entityReactName %> = (props: I<%= entityReactName %>Props) => {
   <%_ } _%>
 
   <%_ if (searchEngine === 'elasticsearch') { _%>
-    <%_ if (pagination !== 'no') { _%>
-  useEffect(() => {
-    props.getSearchEntities(search, paginationState.activePage - 1, paginationState.itemsPerPage, `${paginationState.sort},${paginationState.order}`);
-  }, [paginationState.activePage]);
-
-    <%_ } _%>
   const startSearching = () => {
     if (search) {
       <%_ if (pagination === 'infinite-scroll') { _%>
@@ -141,10 +135,6 @@ export const <%= entityReactName %> = (props: I<%= entityReactName %>Props) => {
     }
   };
 
-  useEffect(() => {
-    props.getEntities()
-  }, [<%_ if (pagination !== 'no') { _%>paginationState.activePage, <%_ } _%>search]);
-
   const clear = () => {
     <%_ if (pagination === 'infinite-scroll') { _%>
     props.reset();
@@ -194,7 +184,7 @@ export const <%= entityReactName %> = (props: I<%= entityReactName %>Props) => {
     <% } else { %>
     sortEntities();
     <% } %>
-  }, [<% if (pagination === 'infinite-scroll') { %>sorting<% } else { %>paginationState.activePage, paginationState.order, paginationState.sort<% } %>]);
+  }, [<% if (pagination === 'infinite-scroll') { %>sorting<% } else { %>paginationState.activePage, paginationState.order, paginationState.sort<% } %><%_ if (searchEngine === 'elasticsearch') { _%>, search<% } %>]);
 
   const sort = p => () => {
     <% if (pagination === 'infinite-scroll') { %>