diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 88e41ead329..57e29b1b992 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -508,13 +508,19 @@ static int bake(
 			if (ob_iter == ob_low)
 				continue;
 
+			if (ob_iter->size[0] != ob_iter->size[1] || ob_iter->size[1] != ob_iter->size[2]) {
+				BKE_reportf(reports, RPT_ERROR,
+				            "Selected objects need to have uniform scale. Apply Scale to object \"%s\"",
+				            ob_iter->id.name + 2);
+				goto cleanup;
+			}
+
+
 			tot_highpoly ++;
 		}
 
 		if (tot_highpoly == 0) {
 			BKE_report(reports, RPT_ERROR, "No valid selected objects");
-			op_result = OPERATOR_CANCELLED;
-
 			goto cleanup;
 		}
 		else {