diff --git a/ng-app/src/app/quotes/quotes.component.html b/ng-app/src/app/quotes/quotes.component.html
index ff6d555..5d9755f 100644
--- a/ng-app/src/app/quotes/quotes.component.html
+++ b/ng-app/src/app/quotes/quotes.component.html
@@ -61,7 +61,7 @@
 
     </mat-table>
 
-    <mat-paginator [length]="dataSource?.count$ | async" [pageSize]="50"
+    <mat-paginator [length]="dataSource?.count$ | async" [pageSize]="20"
                    [pageSizeOptions]="[10, 20, 50, 100, 200]"></mat-paginator>
 
 </div>
diff --git a/ng-app/src/app/quotes/quotes.component.ts b/ng-app/src/app/quotes/quotes.component.ts
index 937fc93..aef2ce3 100644
--- a/ng-app/src/app/quotes/quotes.component.ts
+++ b/ng-app/src/app/quotes/quotes.component.ts
@@ -58,7 +58,7 @@ export class QuotesComponent implements OnInit, AfterViewInit {
 
     ngOnInit() {
         this.dataSource = new QuotesDataSource(this.quotesService);
-        this.dataSource.loadQuotes('', 'id', 'desc', 0, 50);
+        this.dataSource.loadQuotes('', 'id', 'desc', 0, 20);
     }
 
     ngAfterViewInit() {
diff --git a/ng-app/src/app/services/quotes.service.ts b/ng-app/src/app/services/quotes.service.ts
index 6f4ec05..649a9b3 100644
--- a/ng-app/src/app/services/quotes.service.ts
+++ b/ng-app/src/app/services/quotes.service.ts
@@ -21,7 +21,7 @@ export class QuotesService {
 
     findQuotes(
         filter = '', sortBy = 'id', sortOrder = 'desc',
-        pageNumber = 0, pageSize = 50): Observable<Quotes> {
+        pageNumber = 0, pageSize = 20): Observable<Quotes> {
 
         return this.http.get('/quotes/api/quotes', {
             observe: 'response',