diff --git a/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java b/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
index 857f244..965875b 100644
--- a/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
+++ b/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
@@ -580,9 +580,7 @@ public class MappingR2dbcConverter extends BasicRelationalConverter implements R
 
 		if (columns.contains(idColumnName)) {
 			generatedIdValue = row.get(idColumnName);
-		}
-
-		if (columns.size() == 1) {
+		} else if (columns.size() == 1) {
 
 			String key = columns.iterator().next();
 			generatedIdValue = row.get(key);