diff --git a/internal/assets/templates/twitch-channels.html b/internal/assets/templates/twitch-channels.html
index 8e23347..aba7935 100644
--- a/internal/assets/templates/twitch-channels.html
+++ b/internal/assets/templates/twitch-channels.html
@@ -20,7 +20,9 @@
{{ .Name }}
{{ if .Exists }}
{{ if .IsLive }}
- {{ .Category }}
+ {{ if .Category }}
+ {{ .Category }}
+ {{ end }}
- {{ .ViewersCount | formatViewerCount }} viewers
diff --git a/internal/feed/twitch.go b/internal/feed/twitch.go
index 1ce9354..739d7d1 100644
--- a/internal/feed/twitch.go
+++ b/internal/feed/twitch.go
@@ -204,9 +204,11 @@ func fetchChannelFromTwitchTask(channel string) (TwitchChannel, error) {
result.IsLive = true
result.ViewersCount = channelShell.UserOrError.Stream.ViewersCount
- if streamMetadata.UserOrNull != nil && streamMetadata.UserOrNull.Stream != nil && streamMetadata.UserOrNull.Stream.Game != nil {
- result.Category = streamMetadata.UserOrNull.Stream.Game.Name
- result.CategorySlug = streamMetadata.UserOrNull.Stream.Game.Slug
+ if streamMetadata.UserOrNull != nil && streamMetadata.UserOrNull.Stream != nil {
+ if streamMetadata.UserOrNull.Stream.Game != nil {
+ result.Category = streamMetadata.UserOrNull.Stream.Game.Name
+ result.CategorySlug = streamMetadata.UserOrNull.Stream.Game.Slug
+ }
startedAt, err := time.Parse("2006-01-02T15:04:05Z", streamMetadata.UserOrNull.Stream.StartedAt)
if err == nil {