diff --git a/modules/core_api/fsw/inc/cfe_resourceid.h b/modules/core_api/fsw/inc/cfe_resourceid.h
index ed4f85eb6..49108d207 100644
--- a/modules/core_api/fsw/inc/cfe_resourceid.h
+++ b/modules/core_api/fsw/inc/cfe_resourceid.h
@@ -199,8 +199,7 @@ uint32 CFE_ResourceId_GetSerial(CFE_ResourceId_t ResourceId);
  * @param[in]   TableSize the maximum size of the target table
  * @param[in]   CheckFunc a function to check if the given ID is available
  * @returns     Next ID value which does not map to a valid entry
- * @retval      #CFE_RESOURCEID_UNDEFINED if no open slots.
- * @retval      #CFE_ES_BAD_ARGUMENT    @copybrief CFE_ES_BAD_ARGUMENT
+ * @retval      #CFE_RESOURCEID_UNDEFINED if no open slots or bad arguments.
  *
  */
 CFE_ResourceId_t CFE_ResourceId_FindNext(CFE_ResourceId_t StartId, uint32 TableSize,
diff --git a/modules/resourceid/fsw/src/cfe_resourceid_api.c b/modules/resourceid/fsw/src/cfe_resourceid_api.c
index 2c2dd9f52..89bc03c88 100644
--- a/modules/resourceid/fsw/src/cfe_resourceid_api.c
+++ b/modules/resourceid/fsw/src/cfe_resourceid_api.c
@@ -123,7 +123,7 @@ CFE_ResourceId_t CFE_ResourceId_FindNext(CFE_ResourceId_t StartId, uint32 TableS
 
     if (CheckFunc == NULL)
     {
-        return CFE_ES_BAD_ARGUMENT;
+        return CFE_RESOURCEID_UNDEFINED;
     }
 
     ResourceType = CFE_ResourceId_GetBase(StartId);
diff --git a/modules/resourceid/ut-coverage/test_cfe_resourceid.c b/modules/resourceid/ut-coverage/test_cfe_resourceid.c
index 4ccc4e13e..ec77dd709 100644
--- a/modules/resourceid/ut-coverage/test_cfe_resourceid.c
+++ b/modules/resourceid/ut-coverage/test_cfe_resourceid.c
@@ -169,7 +169,7 @@ void TestResourceID(void)
                   CFE_ResourceId_ToInteger(Id));
 
     Id = CFE_ResourceId_FindNext(LastId, 0, NULL);
-    UtAssert_True(CFE_ResourceId_Equal(Id, CFE_ES_BAD_ARGUMENT), "CFE_ResourceId_FindNext() bad input: id=%lx",
+    UtAssert_True(CFE_ResourceId_Equal(Id, CFE_RESOURCEID_UNDEFINED), "CFE_ResourceId_FindNext() bad input: id=%lx",
                   CFE_ResourceId_ToInteger(Id));
 
     UtAssert_INT32_EQ(CFE_ResourceId_ToIndex(Id, RefBase, 1, NULL), CFE_ES_BAD_ARGUMENT);