diff --git a/lib/ExcalidrawBlock.php b/lib/ExcalidrawBlock.php
index 38631b367b7fb3d90df82c94879ef5a07f01161b..5ab61888c2c2faea10e270da432c6683450536fc 100644
--- a/lib/ExcalidrawBlock.php
+++ b/lib/ExcalidrawBlock.php
@@ -91,14 +91,15 @@ class ExcalidrawBlock extends BlockType
     public function getFiles(): array
     {
         $payload = $this->getPayload();
-        if (!$payload['file_id'] && !$payload['folder_id']) {
+        if (empty($payload['file_id']) && empty($payload['folder_id'])) {
             return [];
         }
 
-        if ($payload['file_id']) {
+        if (!empty($payload['file_id'])) {
             $files = [];
 
-            if ($fileRef = \FileRef::find($payload['file_id'])) {
+            $fileRef = \FileRef::find($payload['file_id']);
+            if ($fileRef) {
                 $files[] = $fileRef;
             }
 
diff --git a/views/excalidraw/excalidraw_app.php b/views/excalidraw/excalidraw_app.php
index 3ad3570e9c17acb8acdad6b41eb4583fbf8040a4..e6d324c0202890227582f40532be650ba77a5825 100644
--- a/views/excalidraw/excalidraw_app.php
+++ b/views/excalidraw/excalidraw_app.php
@@ -22,7 +22,7 @@
 <? endif ?>
 
 <div class="excalidraw-content">
-    <? if ($content_bar_text) : ?>
+    <? if (!empty($content_bar_text)) : ?>
         <?= ContentBar::get()
             ->setTOC(new TOCItem($content_bar_text))
             ->setIcon(Icon::create('content'));