diff --git a/backend/app/store/service/service.go b/backend/app/store/service/service.go
index 979214fe..e03c616f 100644
--- a/backend/app/store/service/service.go
+++ b/backend/app/store/service/service.go
@@ -101,7 +101,8 @@ func (s *DataStore) Create(comment store.Comment) (commentID string, err error)
 		comment.PostTitle = title
 	}()
 
-	s.submitImages(comment)
+	defer s.submitImages(comment) // submit images only after creation in Engine
+
 	if e := s.AdminStore.OnEvent(comment.Locator.SiteID, admin.EvCreate); e != nil {
 		log.Printf("[WARN] failed to send create event, %s", e)
 	}