diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java
index cef5cdbdf1a3..90ec06d21bdc 100644
--- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java
+++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java
@@ -4085,17 +4085,27 @@ public void visit(BLangInvocation.BLangResourceAccessInvocation resourceAccessIn
             handleResourceAccessError(resourceAccessInvocation.resourceAccessPathSegments,
                     resourceAccessInvocation.name.pos, DiagnosticErrorCode.UNDEFINED_RESOURCE_METHOD, data,
                     resourceAccessInvocation.name, lhsExprType);
+            return;
         } else if (targetResourceFuncCount > 1) {
-            handleResourceAccessError(resourceAccessInvocation.resourceAccessPathSegments, resourceAccessInvocation.pos,
-                    DiagnosticErrorCode.AMBIGUOUS_RESOURCE_ACCESS_NOT_YET_SUPPORTED, data, lhsExprType);
-        } else {
-            BResourceFunction targetResourceFunc = resourceFunctions.get(0);
-            checkExpr(resourceAccessInvocation.resourceAccessPathSegments,
-                    getResourcePathType(targetResourceFunc.pathSegmentSymbols), data);
-            resourceAccessInvocation.symbol = targetResourceFunc.symbol;
-            resourceAccessInvocation.targetResourceFunc = targetResourceFunc;
-            checkResourceAccessParamAndReturnType(resourceAccessInvocation, targetResourceFunc, data);
+            //Filter the resource function with identifier segment
+            Optional<BResourceFunction> first = resourceFunctions.stream().filter(func -> func.pathSegmentSymbols
+                    .get(func.pathSegmentSymbols.size() - 1).kind == SymbolKind.RESOURCE_PATH_IDENTIFIER_SEGMENT)
+                    .findFirst();
+            if (first.isPresent()) {
+                resourceFunctions = new ArrayList<>(List.of(first.get()));
+            } else {
+                handleResourceAccessError(resourceAccessInvocation.resourceAccessPathSegments,
+                        resourceAccessInvocation.pos, DiagnosticErrorCode.AMBIGUOUS_RESOURCE_ACCESS_NOT_YET_SUPPORTED,
+                        data, lhsExprType);
+                return;
+            }
         }
+        BResourceFunction targetResourceFunc = resourceFunctions.get(0);
+        checkExpr(resourceAccessInvocation.resourceAccessPathSegments,
+                getResourcePathType(targetResourceFunc.pathSegmentSymbols), data);
+        resourceAccessInvocation.symbol = targetResourceFunc.symbol;
+        resourceAccessInvocation.targetResourceFunc = targetResourceFunc;
+        checkResourceAccessParamAndReturnType(resourceAccessInvocation, targetResourceFunc, data);
     }
 
     private void handleResourceAccessError(BLangListConstructorExpr resourceAccessPathSegments,
diff --git a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/actions/SymbolsInResourceAccessActionTest.java b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/actions/SymbolsInResourceAccessActionTest.java
index 0916a5d733f7..dc12244b66fd 100644
--- a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/actions/SymbolsInResourceAccessActionTest.java
+++ b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/actions/SymbolsInResourceAccessActionTest.java
@@ -166,7 +166,7 @@ public Object[][] getResourceAccessActionPathPos() {
     @Test
     public void testPathSegmentOfAmbiguousResourceFunction() {
         Optional<Symbol> symbol = model.symbol(srcFile, LinePosition.from(91, 9));
-        assertTrue(symbol.isEmpty()); // Resource method is ambiguous
+        assertTrue(symbol.isPresent());
     }
 
     // Utils
diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/action/ClientResourceAccessActionNegativeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/action/ClientResourceAccessActionNegativeTest.java
index 7ddf03eb3a50..1d1aea552a4d 100644
--- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/action/ClientResourceAccessActionNegativeTest.java
+++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/action/ClientResourceAccessActionNegativeTest.java
@@ -124,18 +124,10 @@ public void testClientResourceCallNegative() {
                 "too many arguments in call to 'post()'", 90, 13);
         validateError(clientResourceAccessNegative, index++,
                 "too many arguments in call to 'post()'", 91, 13);
-        validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
-                "supported when the corresponding resource method is ambiguous", 145, 13);
-        validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
-                "supported when the corresponding resource method is ambiguous", 146, 13);
-        validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
-                "supported when the corresponding resource method is ambiguous", 147, 13);
         validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
                 "supported when the corresponding resource method is ambiguous", 148, 13);
         validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
                 "supported when the corresponding resource method is ambiguous", 149, 13);
-        validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
-                "supported when the corresponding resource method is ambiguous", 150, 13);
         validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
                 "supported when the corresponding resource method is ambiguous", 151, 13);
         validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +