diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
index 8d7ca2758cbfa3b34f5c70ec0e0d982765da359c..8560454402db3d095d430e9ce5a786dcaadfc65d 100644
--- a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
+++ b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
@@ -130,11 +130,6 @@ export default function EditBlueprintPermissions(props) {
       )
     )
       .then((response) => {
-        if (response.status === 204) {
-          setUsers([]);
-          return;
-        }
-
         const profilesResults = response.data.profiles;
         const usernames = users.map((user) => user.username);
 
diff --git a/jams-react-client/src/views/Users/Users.js b/jams-react-client/src/views/Users/Users.js
index 7c408063fa249d33b128911a2f07b2a962c9331c..ebc30a496778f4da656c41abedbda6df2ca312b3 100644
--- a/jams-react-client/src/views/Users/Users.js
+++ b/jams-react-client/src/views/Users/Users.js
@@ -73,7 +73,7 @@ export default function Users() {
   const classes = useStyles();
   const history = useHistory();
   const [users, setUsers] = useState([]);
-  const [noUsersFound, setNoUsersFound] = useState(false);
+  const noUsersFound = users.length === 0;
   const [noMatchFound, setNoMatchFound] = useState(false);
   const [loading, setLoading] = useState(false);
   const [progress, setProgress] = useState(0);
@@ -104,13 +104,8 @@ export default function Users() {
       )
     )
       .then((response) => {
-        if (response.status !== 204) {
-          setUsers(response.data.profiles);
-
-          setNumberPages(response.data.numPages);
-        } else {
-          setNoUsersFound(true);
-        }
+        setUsers(response.data.profiles);
+        setNumberPages(response.data.numPages);
         setLoading(false);
       })
       .catch((error) => {
@@ -140,16 +135,12 @@ export default function Users() {
     )
       .then((response) => {
         setLoading(false);
-        if (response.status !== 204) {
-          setUsers(response.data.profiles);
-          setNumberPages(response.data.numPages);
-        } else {
-          setNoMatchFound(true);
-        }
+        setUsers(response.data.profiles);
+        setNumberPages(response.data.numPages);
+        setNoMatchFound(response.data.profiles.length === 0);
       })
       .catch((error) => {
         setUsers([]);
-        setNoMatchFound(true);
         setLoading(false);
         if (error.response.status === 401) {
           auth.authenticated = false;
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/directory/SearchDirectoryServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/directory/SearchDirectoryServlet.java
index cd77d04b50e665ccac1cdb458003e9269695f63c..8ca50f7eb544ed8864b05e7a08c0273e4a517bc5 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/directory/SearchDirectoryServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/directory/SearchDirectoryServlet.java
@@ -149,10 +149,7 @@ public class SearchDirectoryServlet extends HttpServlet {
         JSONObject obj = new JSONObject();
         obj.put("profiles", userProfiles);
         obj.put("numPages", dataStore.NUM_PAGES);
-        if (!userProfiles.isEmpty()) {
-            resp.getOutputStream().write((obj.toString()).getBytes());
-            resp.setStatus(200);
-        } else
-            resp.sendError(204, "No users were found!");
+        resp.getOutputStream().write((obj.toString()).getBytes());
+        resp.setStatus(200);
     }
 }
\ No newline at end of file