diff --git a/src/vnet/udp/udp_input.c b/src/vnet/udp/udp_input.c
index 936d94d..ad86f43 100644
--- a/src/vnet/udp/udp_input.c
+++ b/src/vnet/udp/udp_input.c
@@ -110,6 +110,7 @@
 	  int wrote0;
 	  void *rmt_addr, *lcl_addr;
 	  session_dgram_hdr_t hdr0;
+	  u8 queue_event = 1;
 
 	  /* speculatively enqueue b0 to the current next frame */
 	  bi0 = from[0];
@@ -182,6 +183,8 @@
 		      session_dgram_connect_notify (&new_uc0->connection,
 						    s0->thread_index, &s0);
 		      tc0 = &new_uc0->connection;
+		      uc0 = new_uc0;
+		      queue_event = 0;
 		    }
 		  else
 		    s0->session_state = SESSION_STATE_READY;
@@ -254,7 +257,7 @@
 	  clib_spinlock_lock (&uc0->rx_lock);
 	  wrote0 = session_enqueue_dgram_connection (s0, &hdr0, b0,
 						     TRANSPORT_PROTO_UDP,
-						     1 /* queue evt */ );
+						     queue_event);
 	  clib_spinlock_unlock (&uc0->rx_lock);
 	  ASSERT (wrote0 > 0);