diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index f3d6e47331..1ee9c37013 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -12,7 +12,7 @@
         [pageInfoState]="(bitstreamFormats | async)?.payload"
         [collectionSize]="(bitstreamFormats | async)?.payload?.totalElements"
         [hideGear]="true"
-        [hidePagerWhenSinglePage]="false"
+        [hidePagerWhenSinglePage]="true"
         (pageChange)="onPageChange($event)">
         <div class="table-responsive">
           <table id="formats" class="table table-striped table-hover">
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index 67cfa52601..b422e73919 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -12,7 +12,7 @@
         [pageInfoState]="(metadataSchemas | async)?.payload"
         [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
         [hideGear]="true"
-        [hidePagerWhenSinglePage]="false"
+        [hidePagerWhenSinglePage]="true"
         (pageChange)="onPageChange($event)">
         <div class="table-responsive">
           <table id="metadata-schemas" class="table table-striped table-hover">
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index f9e460e717..b321a78f57 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -13,7 +13,7 @@
         [pageInfoState]="(metadataFields | async)?.payload"
         [collectionSize]="(metadataFields | async)?.payload?.totalElements"
         [hideGear]="true"
-        [hidePagerWhenSinglePage]="false"
+        [hidePagerWhenSinglePage]="true"
         (pageChange)="onPageChange($event)">
         <div class="table-responsive">
           <table id="metadata-fields" class="table table-striped table-hover">
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 6b0e4b16c6..2f0bfdeddb 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -21,7 +21,7 @@ export class MetadataSchemaComponent implements OnInit {
   metadataFields: Observable<RemoteData<PaginatedList<MetadataField>>>;
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'registry-metadatafields-pagination',
-    pageSize: 20
+    pageSize: 10000
   });
 
   constructor(private registryService: RegistryService, private route: ActivatedRoute) {