diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java
index 477a5fc9ddc3..596bb93d6085 100644
--- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java
+++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java
@@ -48,10 +48,9 @@ public List<LSCompletionItem> getCompletions(BallerinaCompletionContext context,
     @Override
     public void sort(BallerinaCompletionContext context, AsyncSendActionNode node, 
                      List<LSCompletionItem> completionItems) {
-        int rankOffset = 1;
-        for (LSCompletionItem completionItem : completionItems) {
-            sortByAssignability(context, completionItem, SortingUtil.toRank(context, completionItem, rankOffset));
-            rankOffset++;
+        for (int i = 0; i < completionItems.size(); i++) {
+            LSCompletionItem completionItem = completionItems.get(i);
+            sortByAssignability(context, completionItem, SortingUtil.toRank(context, completionItem, i + 1));
         }
     }
 }
diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java
index fa66c6bc8ac6..ae3b3efa59d0 100644
--- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java
+++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java
@@ -212,8 +212,8 @@ public void sort(BallerinaCompletionContext context, ClientResourceAccessActionN
         }
 
         Optional<TypeSymbol> parameterSymbol = getParameterTypeSymbol(context);
-        int rankOffset = 1;
-        for (LSCompletionItem completionItem : completionItems) {
+        for (int i = 0; i < completionItems.size(); i++) {
+            LSCompletionItem completionItem = completionItems.get(i);
             if (completionItem.getType() == LSCompletionItem.CompletionItemType.NAMED_ARG) {
                 sortNamedArgCompletionItem(context, completionItem);
             } else if (parameterSymbol.isEmpty()) {
@@ -224,10 +224,9 @@ public void sort(BallerinaCompletionContext context, ClientResourceAccessActionN
                         symbolCompletionItem.getSymbol().get().kind() == SymbolKind.RESOURCE_METHOD) {
                     completionItem.getCompletionItem().setSortText(
                             SortingUtil.genSortTextByAssignability(context, completionItem, parameterSymbol.get()) +
-                                    SortingUtil.genSortText(rankOffset));
+                                    SortingUtil.genSortText(i + 1));
                 }
                 sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
-                rankOffset++;
             } else {
                 sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
             }