diff --git a/sway/input/seat.c b/sway/input/seat.c
index 49fe46ba8..75ad31e2d 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -711,7 +711,8 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
 			workspace_consider_destroy(last_workspace);
 		}
 
-		if (config->mouse_warping && warp && new_output != last_output) {
+		if (config->mouse_warping && warp &&
+				new_output != last_output && new_output) {
 			double x = 0;
 			double y = 0;
 			if (container) {