diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/DataMigrationESToPG.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/DataMigrationESToPG.java
index 73783f6eb8..2df9953f83 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/DataMigrationESToPG.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/DataMigrationESToPG.java
@@ -125,27 +125,28 @@ Pair<Integer, Integer> migrateFromEsToPg(final ElasticsearchService elasticServi
 						continue;
 					}
 					if (asset.getId() == null || !asset.getId().toString().equals(hit.id())) {
-						asset.setId(UUID.fromString(hit.id()));
+						try {
+							asset.setId(UUID.fromString(hit.id()));
+						} catch (final Exception e) {
+							log.warn("Unable to parse id into UUID: {}, discarding doc", hit.id());
+							totalFailed++;
+							continue;
+						}
 					}
 					assets.add(asset);
 				}
 
 				if (!assets.isEmpty()) {
 					log.info("Saving {} rows to SQL...", assets.size());
-					long failed = 0;
 					for (final T asset : assets) {
 						try {
 							service.getRepository().save(asset);
 							totalSuccess++;
 						} catch (final Exception e) {
 							log.warn("Failed to insert id: {}", asset.getId(), e);
-							failed += 1;
 							totalFailed++;
 						}
 					}
-					if (failed == assets.size()) {
-						throw new RuntimeException("All assets failed to insert");
-					}
 				}
 
 				if (Objects.equals(lastId, lastPagesLastId) || assets.size() < PAGE_SIZE) {