diff --git a/src/wlserver.cpp b/src/wlserver.cpp
index 7da377e..d724329 100644
--- a/src/wlserver.cpp
+++ b/src/wlserver.cpp
@@ -775,6 +775,7 @@ void wlserver_surface_set_wl_id( struct wlserver_surface *surf, long id )
 	if ( surf->wl_id != 0 )
 	{
 		fprintf( stderr, "surf->wl_id already set, was %lu, set %lu\n", surf->wl_id, id );
+		return;
 	}
 
 	surf->wl_id = id;