diff --git a/composer.lock b/composer.lock
index ad37fb3..2e001aa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -303,16 +303,16 @@
         },
         {
             "name": "pablouser1/tikscraper",
-            "version": "v2.3.6.3",
+            "version": "v2.3.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pablouser1/TikScraperPHP.git",
-                "reference": "99c75fc1786c63276592b0f9859a232f17876f6a"
+                "reference": "b26764777121dbc4408f84140b802869a77b575e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/99c75fc1786c63276592b0f9859a232f17876f6a",
-                "reference": "99c75fc1786c63276592b0f9859a232f17876f6a",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/b26764777121dbc4408f84140b802869a77b575e",
+                "reference": "b26764777121dbc4408f84140b802869a77b575e",
                 "shasum": ""
             },
             "require": {
@@ -346,9 +346,9 @@
             "description": "Get data from TikTok API",
             "support": {
                 "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
-                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.3.6.3"
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.3.6.4"
             },
-            "time": "2023-04-03T14:23:28+00:00"
+            "time": "2023-04-05T15:08:06+00:00"
         },
         {
             "name": "php-webdriver/webdriver",
diff --git a/templates/components/themes/default.latte b/templates/components/themes/default.latte
index 3cd19da..6eaf388 100644
--- a/templates/components/themes/default.latte
+++ b/templates/components/themes/default.latte
@@ -17,15 +17,18 @@
 			{if !empty($item->challenges)}
 			<p>{include './common/tags.latte', challenges: $item->challenges}</p>
 			{/if}
-			<p n:ifcontent>{render_desc($item->desc, $item->textExtra)|noescape}</p>
+			<p n:ifcontent>{render_desc($item->desc, $item->textExtra ?? [])|noescape}</p>
 			<p>Song: {$item->music->title}</p>
 			<audio controls preload="none" src="{url_stream($item->music->playUrl)}"></audio>
 			{include './common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 			<div class="has-text-centered">
 				{include './common/content.latte', item: $item, isAutoplay: false, isBig: false}
 			</div>
+			{if isset($item->video->playAddr)}
+			<!-- Download links, not shown if item is a gallery -->
 			<p class="has-text-centered"><b>Download video</b></p>
 			{include './common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $item->author->uniqueId}
+			{/if}
 			<p class="has-text-centered"><b>Share link</b></p>
 			{include './common/share.latte', uniqueId: $item->author->uniqueId, id: $item->id}
 			<div class="has-text-centered">
diff --git a/templates/views/video.latte b/templates/views/video.latte
index c142d22..8f9b73e 100644
--- a/templates/views/video.latte
+++ b/templates/views/video.latte
@@ -33,13 +33,16 @@
 						<p>{include '../components/themes/common/tags.latte', challenges: $item->challenges}</p>
 						{/if}
 						<div class="content">
-							<p n:ifcontent>{render_desc($item->desc, $item->textExtra)|noescape}</p>
+							<p n:ifcontent>{render_desc($item->desc, $item->textExtra ?? [])|noescape}</p>
 							<p>Song: {$item->music->title}</p>
 							<audio controls preload="none" src="{url_stream($item->music->playUrl)}"></audio>
 							{include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 							<div class="has-text-centered">
 								{include '../components/themes/common/share.latte', uniqueId: $info->detail->uniqueId, id: $item->id}
+								{if isset($item->video->playAddr)}
+								<!-- Download links, not shown if item is a gallery -->
 								{include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $info->detail->uniqueId}
+								{/if}
 							</div>
 						</div>
   				</div>