3 files changed, 7 insertions, 4 deletions
diff --git a/src/vnet/session-apps/echo_client.c b/src/vnet/session-apps/echo_client.c
index bde9f489a34..24a3433d707 100644
--- a/src/vnet/session-apps/echo_client.c
+++ b/src/vnet/session-apps/echo_client.c
@@ -420,7 +420,7 @@ quic_echo_clients_session_connected_callback (u32 app_index, u32 api_context,
       return 0;
     }
 
-  if (!(s->flags & SESSION_F_QUIC_STREAM))
+  if (s->listener_handle == SESSION_INVALID_HANDLE)
     return quic_echo_clients_qsession_connected_callback (app_index,
 							  api_context, s,
 							  is_fail);
diff --git a/src/vnet/session-apps/echo_server.c b/src/vnet/session-apps/echo_server.c
index 7459d03202f..b7a74818cca 100644
--- a/src/vnet/session-apps/echo_server.c
+++ b/src/vnet/session-apps/echo_server.c
@@ -55,6 +55,7 @@ typedef struct
   u64 byte_index;
   u32 **rx_retries;
   u8 transport_proto;
+  u64 listener_handle;		/**< Session handle of the root listener */
 
   vlib_main_t *vlib_main;
 } echo_server_main_t;
@@ -72,7 +73,7 @@ int
 quic_echo_server_session_accept_callback (session_t * s)
 {
   echo_server_main_t *esm = &echo_server_main;
-  if (!(s->flags & SESSION_F_QUIC_STREAM))
+  if (s->listener_handle == esm->listener_handle)
     return quic_echo_server_qsession_accept_callback (s);
   DBG ("SSESSION %u accept w/opaque %d", s->session_index, s->opaque);
 
@@ -398,12 +399,15 @@ echo_server_detach (void)
 static int
 echo_server_listen ()
 {
+  int rv;
   echo_server_main_t *esm = &echo_server_main;
   vnet_listen_args_t _a, *a = &_a;
   clib_memset (a, 0, sizeof (*a));
   a->app_index = esm->app_index;
   a->uri = esm->server_uri;
-  return vnet_bind_uri (a);
+  rv = vnet_bind_uri (a);
+  esm->listener_handle = a->handle;
+  return rv;
 }
 
 static int
diff --git a/src/vnet/session/session_types.h b/src/vnet/session/session_types.h
index ae5d4db2296..be1111f3b20 100644
--- a/src/vnet/session/session_types.h
+++ b/src/vnet/session/session_types.h
@@ -131,7 +131,6 @@ typedef enum session_flags_
 {
   SESSION_F_RX_EVT = 1,
   SESSION_F_PROXY = (1 << 1),
-  SESSION_F_QUIC_STREAM = (1 << 2),
 } session_flags_t;
 
 typedef struct session_