diff --git a/awx/ui_next/src/util/useRequest.js b/awx/ui_next/src/util/useRequest.js index 764297941a..8dc7e9a282 100644 --- a/awx/ui_next/src/util/useRequest.js +++ b/awx/ui_next/src/util/useRequest.js @@ -38,18 +38,16 @@ export default function useRequest(makeRequest, initialValue) { request: useCallback( async (...args) => { setIsLoading(true); - if (isMounted.current) { - setResult(initialValue); - setError(null); - } try { const response = await makeRequest(...args); if (isMounted.current) { setResult(response); + setError(null); } } catch (err) { if (isMounted.current) { setError(err); + setResult(initialValue); } } finally { if (isMounted.current) {