diff --git a/resources/views/livewire/devices/logs.blade.php b/resources/views/livewire/devices/logs.blade.php
index 4f46a9f..7bbaf7b 100644
--- a/resources/views/livewire/devices/logs.blade.php
+++ b/resources/views/livewire/devices/logs.blade.php
@@ -45,9 +45,14 @@ new class extends Component {
 
                 <tbody class="divide-y divide-zinc-800/10 dark:divide-white/20" data-flux-rows="">
                     @foreach ($logs as $log)
+                        @if (!isset($log->log_entry['log_message']))
+                            @continue
+                        @endif
                         <tr data-flux-row="">
                             <td class="py-3 px-3 first:pl-0 last:pr-0 text-sm whitespace-nowrap text-zinc-500 dark:text-zinc-300">
-                                {{ \Carbon\Carbon::createFromTimestamp($log->log_entry['creation_timestamp'])->setTimezone(config('app.timezone'))->format('Y-m-d H:i:s') }}
+                                @if (isset($log->log_entry['creation_timestamp']))
+                                    {{ \Carbon\Carbon::createFromTimestamp($log->log_entry['creation_timestamp'])->setTimezone(config('app.timezone'))->format('Y-m-d H:i:s') }}
+                                @endif
                             </td>
                             <td class="py-3 px-3 first:pl-0 last:pr-0 text-sm whitespace-nowrap text-zinc-500 dark:text-zinc-300">
                                 <div class="inline-flex items-center font-medium whitespace-nowrap -mt-1 -mb-1 text-xs py-1 px-2 rounded-md
diff --git a/tests/Feature/Api/DeviceEndpointsTest.php b/tests/Feature/Api/DeviceEndpointsTest.php
index 3152449..805fc92 100644
--- a/tests/Feature/Api/DeviceEndpointsTest.php
+++ b/tests/Feature/Api/DeviceEndpointsTest.php
@@ -176,7 +176,7 @@ test('device can submit logs', function () {
     $logData = [
         'log' => [
             'logs_array' => [
-                ['message' => 'Test log message', 'level' => 'info'],
+                ['log_message' => 'Test log message', 'level' => 'info'],
             ],
         ],
     ];