diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go
index e9f101fa14..b3f9b6d34e 100644
--- a/cmd/dlv/dlv_test.go
+++ b/cmd/dlv/dlv_test.go
@@ -867,7 +867,7 @@ func TestRemoteDAPClientAfterContinue(t *testing.T) {
 	c.ContinueRequest(1)
 	c.ExpectContinueResponse(t)
 	c.DisconnectRequest()
-	c.ExpectOutputEventClosingClient(t)
+	c.ExpectOutputEventClosingClient(t, "running")
 	c.ExpectDisconnectResponse(t)
 	c.ExpectTerminatedEvent(t)
 	c.Close()
diff --git a/service/dap/server.go b/service/dap/server.go
index 3a25499483..c900135116 100644
--- a/service/dap/server.go
+++ b/service/dap/server.go
@@ -499,7 +499,7 @@ func (s *Session) address() string {
 	if s.config.Listener != nil {
 		return s.config.Listener.Addr().String()
 	}
-	if netconn, ok := s.conn.(net.Conn); ok {
+	if netconn, ok := s.conn.ReadWriteCloser.(net.Conn); ok {
 		return netconn.LocalAddr().String()
 	}
 	return ""