diff --git a/pkg/rooms/buffereddatachannel.go b/pkg/rooms/buffereddatachannel.go
index e2a35afe..66f90c20 100644
--- a/pkg/rooms/buffereddatachannel.go
+++ b/pkg/rooms/buffereddatachannel.go
@@ -6,6 +6,9 @@ import (
 	"github.com/pion/webrtc/v3"
 )
 
+// @TODO: Probably for restarts, we do not want to close this channel.
+// Instead we want to start and stop buffering depending on the state.
+
 type BufferedDataChannel struct {
 	channel  *webrtc.DataChannel
 	msgQueue chan []byte
diff --git a/pkg/rooms/room.go b/pkg/rooms/room.go
index 6062dd04..4971ab50 100644
--- a/pkg/rooms/room.go
+++ b/pkg/rooms/room.go
@@ -283,7 +283,7 @@ func (r *Room) Handle(me *Member) {
 					Joined: &pb.Event_Joined{User: me.ToProto()},
 				},
 			})
-		case webrtc.ICEConnectionStateClosed, webrtc.ICEConnectionStateFailed:
+		case webrtc.ICEConnectionStateClosed:
 			r.onDisconnected(int64(me.id))
 		}
 	}