diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index a064ee9b4f7..c976aa8965e 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -26,7 +26,7 @@
 				<div class="ui bottom attached table segment members">
 					{{range .Team.Members}}
 						<div class="item">
-							{{if and $.IsOrganizationOwner (not (eq $.SignedUser.ID .ID))}}
+							{{if and $.IsOrganizationOwner (not (and ($.Team.IsOwnerTeam) (eq (len $.Team.Members) 1)))}}
 								<form>
 									<button class="ui red button delete-button right" data-modal-id="remove-team-member"
 										data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove" data-datauid="{{.ID}}"
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index 2dec681b4c6..c0ca459f67f 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -74,8 +74,8 @@
 						</tbody>
 					</table>
 				{{end}}
-			{{end}}
-		</div>
+			</div>
+		{{end}}
 	</div>
 	{{if .IsOrganizationOwner}}
 		<div class="ui bottom attached segment">