diff --git a/frontend/src/components/dialog/delete-repo-dialog.js b/frontend/src/components/dialog/delete-repo-dialog.js
index 3204966cc6..4a31ecf4a1 100644
--- a/frontend/src/components/dialog/delete-repo-dialog.js
+++ b/frontend/src/components/dialog/delete-repo-dialog.js
@@ -52,9 +52,12 @@ class DeleteRepoDialog extends Component {
     let message = gettext('Are you sure you want to delete %s ?');
     message = message.replace('%s', repoName);
 
-    let alert_message = gettext('This library has been shared to {user_amount} user(s) and {group_amount} group(s).');
-    alert_message = alert_message.replace('{user_amount}', this.state.sharedToUserCount);
-    alert_message = alert_message.replace('{group_amount}', this.state.sharedToGroupCount);
+    let alert_message = '';
+    if (this.state.sharedToUserCount > 0 || this.state.sharedToGroupCount > 0) {
+      alert_message = gettext('This library has been shared to {user_amount} user(s) and {group_amount} group(s).');
+      alert_message = alert_message.replace('{user_amount}', this.state.sharedToUserCount);
+      alert_message = alert_message.replace('{group_amount}', this.state.sharedToGroupCount);
+    }
 
     const { toggle: toggleDialog } = this.props;
 
@@ -63,7 +66,7 @@ class DeleteRepoDialog extends Component {
         <ModalHeader toggle={toggleDialog}>{gettext('Delete Library')}</ModalHeader>
         <ModalBody>
           <p dangerouslySetInnerHTML={{__html: message}}></p>
-          <p className="error" dangerouslySetInnerHTML={{__html: alert_message}}></p>
+          { alert_message != '' && <p className="error" dangerouslySetInnerHTML={{__html: alert_message}}></p>}
         </ModalBody>
         <ModalFooter>
           <Button color="secondary" onClick={toggleDialog}>{gettext('Cancel')}</Button>
diff --git a/seahub/api2/endpoints/repos.py b/seahub/api2/endpoints/repos.py
index ea071ae626..4f2a52da68 100644
--- a/seahub/api2/endpoints/repos.py
+++ b/seahub/api2/endpoints/repos.py
@@ -429,9 +429,17 @@ class RepoShareInfoView(APIView):
             shared_users = seafile_api.list_repo_shared_to(repo_owner, repo_id)
             shared_groups = seafile_api.list_repo_shared_group_by_user(repo_owner, repo_id)
 
+        group_id = ''
+        if '@seafile_group' in repo_owner:
+            group_id = get_group_id_by_repo_owner(repo_owner)
+
+        shared_group_ids = [item.group_id for item in shared_groups]
+        if group_id and group_id in shared_group_ids:
+            shared_group_ids.remove(group_id)
+
         result = {
             "shared_user_emails": [item.user for item in shared_users],
-            "shared_group_ids": [item.group_id for item in shared_groups],
+            "shared_group_ids": shared_group_ids,
         }
 
         return Response(result)