diff --git a/macros.cfg b/macros.cfg
index 688e4b54..0d0e8066 100644
--- a/macros.cfg
+++ b/macros.cfg
@@ -611,9 +611,13 @@ gcode:
 
 	
 	# Calibrate a new beacon model on print if enabled
-	{% if printer.configfile.settings.beacon is defined and beacon_contact_calibrate_model_on_print %}
+	{% if printer.configfile.settings.beacon is defined and beacon_contact_start_print_true_zero %}
 		_MOVE_TO_SAFE_Z_HOME
-		BEACON_AUTO_CALIBRATE
+		{% if beacon_contact_calibrate_model_on_print %}
+			BEACON_AUTO_CALIBRATE
+		{% else %}
+			BEACON_AUTO_CALIBRATE SKIP_MODEL_CREATION=1
+		{% endif %}
 	{% endif %}
 
 	# Run the user created "AFTER_HEATING_BED" macro