diff --git a/channels/manager.go b/channels/manager.go
index d4159c5c12e8fc73b837953f043b83b2e1dd4052..5517ffa9bb147bb403a8b6a02e9afe3ed2e35fb7 100644
--- a/channels/manager.go
+++ b/channels/manager.go
@@ -191,6 +191,8 @@ func (m *manager) GetChannel(chID *id.ID) (*cryptoBroadcast.Channel, error) {
 	jc, err := m.getChannel(chID)
 	if err != nil {
 		return nil, err
+	} else if jc.broadcast == nil {
+		return nil, errors.New("broadcast.Channel on joinedChannel is nil")
 	}
 	return jc.broadcast.Get(), nil
 }