diff --git a/CRM/UF/Page/Group.php b/CRM/UF/Page/Group.php
index 265c2f65998..e664706f477 100644
--- a/CRM/UF/Page/Group.php
+++ b/CRM/UF/Page/Group.php
@@ -360,7 +360,11 @@ public function browse($action = NULL) {
         $action -= CRM_Core_Action::ADD;
         $action -= CRM_Core_Action::ADVANCED;
         $action -= CRM_Core_Action::BASIC;
-        $action -= CRM_Core_Action::PROFILE;
+
+        //CRM-21004
+        if (array_key_exists(CRM_Core_Action::PROFILE, self::$_actionLinks)) {
+          $action -= CRM_Core_Action::PROFILE;
+        }
       }
 
       $ufGroup[$id]['group_type'] = self::formatGroupTypes($groupTypes);