diff --git a/project_details.php b/project_details.php
index 4b52b8a5..3801b73f 100644
--- a/project_details.php
+++ b/project_details.php
@@ -26,6 +26,11 @@ if (isset($_GET['project_id'])) {
     $project_name = nullable_htmlentities($row['project_name']);
     $project_description = nullable_htmlentities($row['project_description']);
     $project_due = nullable_htmlentities($row['project_due']);
+    if ($project_due) {
+        $project_due_display = "<small class='text-secondary'><i class='fa fa-fw fa-clock mr-2'></i>$project_due</small>";
+    } else {
+        $project_due_display = "<small class='text-secondary'><i class='fa fa-fw fa-clock mr-2'></i>No Date Set</small>";
+    }
     $project_created_at = date("Y-m-d", strtotime($row['project_created_at']));
     $project_updated_at = nullable_htmlentities($row['project_updated_at']);
 
@@ -98,7 +103,7 @@ if (isset($_GET['project_id'])) {
                 <i class="fa fa-fw fa-2x fa-user text-secondary mr-3"></i>
                 <div class="media-body">
                     <h3 class="mb-0"><?php echo $client_name; ?></h3>
-                    <div><small class="text-secondary"><i class="fa fa-fw fa-clock mr-2"></i><?php echo $project_due; ?></small></div>
+                    <div><?php echo $project_due_display; ?></div>
                 </div>
             </div>
         </div>
diff --git a/projects.php b/projects.php
index 32b53c8b..4f451552 100644
--- a/projects.php
+++ b/projects.php
@@ -99,6 +99,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $project_name = nullable_htmlentities($row['project_name']);
                         $project_description = nullable_htmlentities($row['project_description']);
                         $project_due = nullable_htmlentities($row['project_due']);
+                        if ($project_due) {
+                            $project_due_display = $project_due;
+                        } else {
+                            $project_due_display = "-";
+                        }
                         $project_created_at = date("Y-m-d", strtotime($row['project_created_at']));
                         $project_updated_at = nullable_htmlentities($row['project_updated_at']);
 
@@ -161,7 +166,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fa fas fa-fw fa-life-ring mr-2"></i>
                                     <div class="progress-bar bg-success" style="width: <?php echo $tickets_closed_percent; ?>%;"><?php echo $closed_ticket_count; ?> / <?php echo $ticket_count; ?></div>
                                 </div>
-                                <?php } ?>
+                                <?php } else { echo "<div>-</div>"; } ?>
                                 <?php if($task_count) { ?>
                                 <div class="progress mt-2" style="height: 20px;">
                                     <i class="fa fas fa-fw fa-tasks mr-2"></i>
@@ -169,7 +174,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </div>
                                 <?php } ?>
                             </td>
-                            <td><?php echo $project_due; ?></td>
+                            <td><?php echo $project_due_display; ?></td>
                             <td>
                                 <a href="client_tickets.php?client_id=<?php echo $client_id; ?>">
                                     <?php echo $client_name; ?>