diff --git a/frontend/src/app/component/images/images.component.html b/frontend/src/app/component/images/images.component.html
index 9cbffd4..2d4c27b 100644
--- a/frontend/src/app/component/images/images.component.html
+++ b/frontend/src/app/component/images/images.component.html
@@ -7,8 +7,8 @@
 </div>
 
 <mat-expansion-panel
-  *ngFor="let image of images | slice:paginationGetStart():paginationGetEnd(); let i = index"
-  (opened)="loadImage(i + paginationGetStart(), image.filename.split('.')[0])"
+  *ngFor="let image of filterOnlyNewestImageVersion() | slice:paginationGetStart():paginationGetEnd()"
+  (opened)="loadImage(getImageIndex(image), image.filename.split('.')[0])"
 >
   <mat-expansion-panel-header (click)="$event.stopPropagation()">
     <h4 style="width: 25em"
@@ -69,8 +69,8 @@
   </ng-template>
 </mat-expansion-panel>
 
-<mat-paginator *ngIf="images.length > 0"
-               [length]="images.length"
+<mat-paginator *ngIf="filterOnlyNewestImageVersion().length > 0"
+               [length]="filterOnlyNewestImageVersion().length"
                [pageSize]="pageSizeOptions[0]"
                [pageSizeOptions]="pageSizeOptions"
                (page)="lastPageEvent = $event"
diff --git a/frontend/src/app/component/images/images.component.ts b/frontend/src/app/component/images/images.component.ts
index ff455f1..d924cf2 100644
--- a/frontend/src/app/component/images/images.component.ts
+++ b/frontend/src/app/component/images/images.component.ts
@@ -58,4 +58,12 @@ export class ImagesComponent implements OnInit, AfterViewInit {
       this.logger.error('loadImage', i, id, err);
     });
   }
+
+  filterOnlyNewestImageVersion() {
+    return this.images.filter(image => !image.previous);
+  }
+
+  getImageIndex(image: ImageMetadata) {
+    return this.images.findIndex(img => image === img);
+  }
 }
diff --git a/frontend/src/app/interfaces/interface.ts b/frontend/src/app/interfaces/interface.ts
index f132afe..668cd8b 100644
--- a/frontend/src/app/interfaces/interface.ts
+++ b/frontend/src/app/interfaces/interface.ts
@@ -21,6 +21,7 @@ export interface ImageMetadata {
   image_b64?: string;
   tag?: string;
   version?: string;
+  previous?: string;
 }
 
 export interface GetImageResponse {