diff --git a/api/http/handler/docker/images/images_list.go b/api/http/handler/docker/images/images_list.go
index 33d8d40c7..a61372422 100644
--- a/api/http/handler/docker/images/images_list.go
+++ b/api/http/handler/docker/images/images_list.go
@@ -2,6 +2,7 @@ package images
 
 import (
 	"net/http"
+	"strings"
 
 	"github.com/docker/docker/api/types"
 	"github.com/portainer/portainer/api/http/handler/docker/utils"
@@ -66,6 +67,12 @@ func (handler *Handler) imagesList(w http.ResponseWriter, r *http.Request) *http
 
 	imagesList := make([]ImageResponse, len(images))
 	for i, image := range images {
+		if (image.RepoTags == nil || len(image.RepoTags) == 0) && (image.RepoDigests != nil && len(image.RepoDigests) > 0) {
+			for _, repoDigest := range image.RepoDigests {
+				image.RepoTags = append(image.RepoTags, repoDigest[0:strings.Index(repoDigest, "@")]+":<none>")
+			}
+		}
+
 		imagesList[i] = ImageResponse{
 			Created: image.Created,
 			ID:      image.ID,
diff --git a/app/react/components/datatables/TableContent.tsx b/app/react/components/datatables/TableContent.tsx
index a76dc8ea6..df522de31 100644
--- a/app/react/components/datatables/TableContent.tsx
+++ b/app/react/components/datatables/TableContent.tsx
@@ -26,8 +26,8 @@ export function TableContent<T extends DefaultType = DefaultType>({
 
   return (
     <>
-      {rows.map((row) => (
-        <Fragment key={row.id}>{renderRow(row)}</Fragment>
+      {rows.map((row, index) => (
+        <Fragment key={`${row.id}-${index}`}>{renderRow(row)}</Fragment>
       ))}
     </>
   );