diff --git a/gns3server/compute/docker/__init__.py b/gns3server/compute/docker/__init__.py
index 4521da13..1ff3430d 100644
--- a/gns3server/compute/docker/__init__.py
+++ b/gns3server/compute/docker/__init__.py
@@ -157,7 +157,8 @@ class Docker(BaseManager):
         """
         images = []
         for image in (yield from self.query("GET", "images/json", params={"all": 0})):
-            for tag in image['RepoTags']:
-                if tag != "<none>:<none>":
-                    images.append({'image': tag})
+            if image['RepoTags']:
+                for tag in image['RepoTags']:
+                    if tag != "<none>:<none>":
+                        images.append({'image': tag})
         return sorted(images, key=lambda i: i['image'])