diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 95378327c..049c5d07a 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -432,8 +432,8 @@
       <h3>
         <?php 
           // Set the link filter for External Identity Roles
-          $curId = $this->request->getQuery($vv_primary_link);
-          if(!empty($vv_obj)) {
+          $curId = $vv_primary_link_obj->id;
+          if(!empty($vv_obj) && ($curController == 'ExternalIdentityRoles' && ($curAction == 'edit' || $curAction == 'view'))) {
             $curId = $vv_obj->id;  
           }
           $linkFilter = ['external_identity_role_id' => $curId];