diff --git a/components/engine/graph.go b/components/engine/graph.go
index 29d8b2bb6f..6f93f2b827 100644
--- a/components/engine/graph.go
+++ b/components/engine/graph.go
@@ -110,12 +110,44 @@ func (graph *Graph) Garbage() (*Graph, error) {
 	return NewGraph(path.Join(graph.Root, ":garbage:"))
 }
 
+// Check if given error is "not empty"
+// Note: this is the way golang do it internally with os.IsNotExists
+func isNotEmpty(err error) bool {
+	switch pe := err.(type) {
+	case nil:
+		return false
+	case *os.PathError:
+		err = pe.Err
+	case *os.LinkError:
+		err = pe.Err
+	}
+	return strings.Contains(err.Error(), " not empty")
+}
+
 func (graph *Graph) Delete(id string) error {
 	garbage, err := graph.Garbage()
 	if err != nil {
 		return err
 	}
-	return os.Rename(graph.imageRoot(id), garbage.imageRoot(id))
+	err = os.Rename(graph.imageRoot(id), garbage.imageRoot(id))
+	if err != nil {
+		if isNotEmpty(err) {
+			Debugf("The image %s is already present in garbage. Removing it.", id)
+			if err = os.RemoveAll(garbage.imageRoot(id)); err != nil {
+				Debugf("Error while removing the image %s from garbage: %s\n", id, err)
+				return err
+			}
+			Debugf("Image %s removed from garbage", id)
+			if err = os.Rename(graph.imageRoot(id), garbage.imageRoot(id)); err != nil {
+				return err
+			}
+			Debugf("Image %s put in the garbage", id)
+		} else {
+			Debugf("Error putting the image %s to garbage: %s\n", id, err)
+		}
+		return err
+	}
+	return nil
 }
 
 func (graph *Graph) Undelete(id string) error {
diff --git a/components/engine/graph_test.go b/components/engine/graph_test.go
index b9bdc5140f..61bac92d9e 100644
--- a/components/engine/graph_test.go
+++ b/components/engine/graph_test.go
@@ -158,6 +158,14 @@ func TestDelete(t *testing.T) {
 	}
 	assertNImages(graph, t, 1)
 
+	// Test delete twice (pull -> rm -> pull -> rm)
+	if err := graph.Register(archive, img1); err != nil {
+		t.Fatal(err)
+	}
+	if err := graph.Delete(img1.Id); err != nil {
+		t.Fatal(err)
+	}
+	assertNImages(graph, t, 1)
 }
 
 func assertNImages(graph *Graph, t *testing.T, n int) {