diff --git a/src/client/src/components/Search/Search.js b/src/client/src/components/Search/Search.js
index f326b782..262eccf6 100644
--- a/src/client/src/components/Search/Search.js
+++ b/src/client/src/components/Search/Search.js
@@ -8,6 +8,7 @@ import trancheEffectif from "../../containers/Search/tranche-effectif.json";
 import UsersFeedback from "../../containers/UsersFeedback";
 import Config from "../../services/Config";
 import SearchResults from "../SearchResults";
+import { useCodeNaf } from "./codeNaf.gql.js";
 import AdministartionFilter from "./Filters/AdministartionFilter.jsx";
 import AutoCompleteFilter from "./Filters/AutoCompleteFilter";
 import CheckboxFilter from "./Filters/CheckboxFilter";
@@ -15,12 +16,6 @@ import DirigeantFromFilter from "./Filters/DirigeantFromFilter";
 import LocationFilter from "./Filters/LocationFilter";
 import SearchBar from "./SearchBar";
 
-const formatDivisionsNaf = (divisionsNaf) =>
-  divisionsNaf.map(({ code, libelle }) => ({
-    label: `${code} - ${libelle}`,
-    value: code,
-  }));
-
 const formatTrancheEffectifs = (trancheEffectifs) =>
   trancheEffectifs.map(({ code, libelle }) => ({
     label: libelle,
@@ -49,10 +44,11 @@ const Search = ({
   sortField,
   sortDirection,
   options,
-  divisionsNaf,
   generateXlsx,
   downloadLoading,
 }) => {
+  const { data: codesNaf } = useCodeNaf();
+
   const onFormSubmit = (e) => {
     e.preventDefault();
     sendRequest(searchTerm, options);
@@ -176,12 +172,13 @@ const Search = ({
                     placeholder="Choisir une tranche d’effectif"
                   />
                   <div className="horizontal-separator" />
+
                   <AutoCompleteFilter
                     filters={filters}
                     addFilter={addFilter}
                     removeFilter={removeFilter}
-                    options={formatDivisionsNaf(divisionsNaf)}
-                    id="activites"
+                    options={codesNaf}
+                    id="naf"
                     label="Activité (NAF ou libellé)"
                     placeholder="Choisir un code NAF/APE"
                   />
diff --git a/src/server/src/utils/elastic.js b/src/server/src/utils/elastic.js
index 5177d82c..15a00b15 100644
--- a/src/server/src/utils/elastic.js
+++ b/src/server/src/utils/elastic.js
@@ -17,6 +17,7 @@ const filtersFieldMap = {
   departement: "departement",
   codesPostaux: "codesPostalEtablissement",
   tranchesEffectifs: "trancheEffectifsEtablissement",
+  naf:"codeActivitePrincipale"
 };
 
 const getCodeNafLibelle = (code) =>
@@ -212,6 +213,7 @@ const formatElasticResult = (hit) => {
 export const getElasticQueryParams = (req) => {
   const query = (req.query["q"] || "").trim();
   const activites = req.query["activites"] || [];
+  const naf=req.query["naf"] || [];
   const codesCommunes = req.query["codesCommunes"] || [];
   const codesPostaux = req.query["codesPostaux"] || [];
   const departement = req.query["departements"] || [];
@@ -237,10 +239,12 @@ export const getElasticQueryParams = (req) => {
     codesPostaux,
     tranchesEffectifs,
     dirigeant,
+    naf
   };
 };
 
 export const requestElastic = async (params, { from, size }) => {
+  console.log(params);
   const body = makeQuery(params);
   const {
     body: {