diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
index d8ed1467..cb498da5 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
@@ -351,12 +351,14 @@ async function send_poc_email_link() {
                                 'datetime_long',
                                 pres_mgmt_loc.current.use_12h
                             )}
-                            –
-                            {ae_util.iso_datetime_formatter(
-                                $lq__event_session_obj.end_datetime,
-                                'time_short',
-                                pres_mgmt_loc.current.use_12h
-                            )}
+                            {#if $lq__event_session_obj.end_datetime}
+                                –
+                                {ae_util.iso_datetime_formatter(
+                                    $lq__event_session_obj.end_datetime,
+                                    'datetime_long',
+                                    pres_mgmt_loc.current.use_12h
+                                )}
+                            {/if}
                         </span>
 
                         <!-- Datetime editors — only in edit_mode -->
@@ -396,7 +398,12 @@ async function send_poc_email_link() {
                                         })}>
                                     <span class="text-xs font-semibold opacity-60">
                                         <Clock size="0.9em" class="mr-1 inline" />End:
+                                        {#if $lq__event_session_obj.end_datetime}
+
                                         {ae_util.iso_datetime_formatter($lq__event_session_obj.end_datetime, 'datetime_long', pres_mgmt_loc.current.use_12h)}
+                                        {:else}
+                                            <span class="italic opacity-60">Not set</span>
+                                        {/if}
                                     </span>
                                 </Element_ae_obj_field_editor>
                             </div>
diff --git a/src/routes/events/ae_comp__event_session_obj_li.svelte b/src/routes/events/ae_comp__event_session_obj_li.svelte
index 6beccc9e..61bdeecb 100644
--- a/src/routes/events/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_li.svelte
@@ -242,7 +242,7 @@ function toggle_details(id: string) {
 
                         <td class="hidden md:table-cell">
                             <div class="flex flex-col text-xs hover:scale-125 transition-all duration-400 hover:duration-1000">
-                                <span class=" text-surface-700-300"
+                                <span class=" text-surface-700-300 min-w-30"
                                     >
                                     <span class="font-bold">
                                     {ae_util.iso_datetime_formatter(
@@ -262,11 +262,15 @@ function toggle_details(id: string) {
                                         session_obj?.start_datetime,
                                         'time_12_short'
                                     )}</span>
+                                    {#if session_obj?.end_datetime}
                                     <span class="text-surface-500">
                                     – {ae_util.iso_datetime_formatter(
                                         session_obj?.end_datetime,
                                         'time_12_short'
                                     )}</span>
+                                    {:else}
+
+                                    {/if}
                                 </span>
                             </div>
                         </td>