diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm
index ec1b535f2..838a09a16 100644
--- a/lib/Slic3r/GCode.pm
+++ b/lib/Slic3r/GCode.pm
@@ -428,7 +428,9 @@ sub set_bed_temperature {
     my ($temperature, $wait) = @_;
     
     my ($code, $comment) = $wait
-        ? (($Slic3r::gcode_flavor eq 'makerbot' ? 'M109' : 'M190'), 'wait for bed temperature to be reached')
+        ? (($Slic3r::gcode_flavor eq 'makerbot' ? 'M109'
+            : $Slic3r::gcode_flavor eq 'teacup' ? 'M109 P1'
+            : 'M190'), 'wait for bed temperature to be reached')
         : ('M140', 'set bed temperature');
     return sprintf "$code %s%d ; $comment\n",
         ($Slic3r::gcode_flavor eq 'mach3' ? 'P' : 'S'), $temperature;