diff --git a/cli/medperf/web_ui/templates/benchmark_detail.html b/cli/medperf/web_ui/templates/benchmark_detail.html
index 448d35dfb..b612a720e 100644
--- a/cli/medperf/web_ui/templates/benchmark_detail.html
+++ b/cli/medperf/web_ui/templates/benchmark_detail.html
@@ -24,7 +24,11 @@ <h5 class="card-title mb-0">Details</h5>
             <div class="card mb-3">
                 <div class="card-body">
                     <p class="card-text"><strong>Description:</strong> {{ entity.description }}</p>
-                    <p class="card-text"><strong>Documentation:</strong> <a href="{{ entity.docs_url }}" class="text-primary" target="_blank">{{ entity.docs_url }}</a></p>
+                    {% if entity.docs_url %}
+                        <p class="card-text"><strong>Documentation:</strong> <a href="{{ entity.docs_url }}" class="text-primary" target="_blank">{{ entity.docs_url }}</a></p>
+                    {% else %}
+                        <p class="card-text"><strong>Documentation:</strong> Not Available</p>
+                    {% endif %}
                     <p class="card-text"><strong>Demo Dataset Tarball:</strong> <a href="{{ entity.demo_dataset_tarball_url }}" class="text-primary" target="_blank">{{ entity.demo_dataset_tarball_url }}</a></p>
                     <p class="card-text text-muted small">{{ entity.demo_dataset_tarball_hash }}</p>
                 </div>
diff --git a/cli/medperf/web_ui/templates/benchmarks.html b/cli/medperf/web_ui/templates/benchmarks.html
index 36fe70e8d..ccd534a50 100644
--- a/cli/medperf/web_ui/templates/benchmarks.html
+++ b/cli/medperf/web_ui/templates/benchmarks.html
@@ -17,7 +17,11 @@ <h5 class="card-title"><a href="/benchmarks/ui/{{ benchmark.id }}" class="text-p
                     <h6 class="card-subtitle mb-2 text-muted">{{ benchmark.state }}</h6>
                     <h6 class="card-subtitle mb-2 text-muted">Is valid: {{ benchmark.is_valid }}</h6>
                     <p class="card-text"><strong>Description:</strong> {{ benchmark.description }}</p>
-                    <p class="card-text"><a href="{{ benchmark.docs_url }}" target="_blank" class="text-primary">Documentation</a></p>
+                    {% if benchmark.docs_url %}
+                        <p class="card-text"><a href="{{ benchmark.docs_url }}" target="_blank" class="text-primary">Documentation</a></p>
+                    {% else %}
+                        <p class="card-text text-muted">Documentation: Not Available</p>
+                    {% endif %}
                     <p class="card-text"><small class="text-muted" data-date="{{ benchmark.created_at }}"></small></p>
                     <p class="card-text"><small class="text-muted">Approval Status: {{ benchmark.approval_status }}</small></p>
                 </div>
diff --git a/cli/medperf/web_ui/templates/mlcube_detail.html b/cli/medperf/web_ui/templates/mlcube_detail.html
index 0164463f8..6c1deb84d 100644
--- a/cli/medperf/web_ui/templates/mlcube_detail.html
+++ b/cli/medperf/web_ui/templates/mlcube_detail.html
@@ -82,10 +82,20 @@ <h5 class="card-title mb-0">Details</h5>
                         <p class="card-text text-muted small">{{ entity.mlcube_hash }}</p>
                         <p class="card-text"><strong>Parameters:</strong> <a href="{{ entity.git_parameters_url }}" class="text-primary yaml-link" target="_blank">{{ entity.git_parameters_url }}</a></p>
                         <p class="card-text text-muted small">{{ entity.parameters_hash }}</p>
-                        <p class="card-text"><strong>Image Tarball:</strong> <a href="{{ entity.image_tarball_url }}" class="text-primary" target="_blank">{{ entity.image_tarball_url }}</a></p>
-                        <p class="card-text text-muted small">{{ entity.image_tarball_hash }}</p>
-                        <p class="card-text"><strong>Additional Files:</strong> <a href="{{ entity.additional_files_tarball_url }}" class="text-primary" target="_blank">{{ entity.additional_files_tarball_url }}</a></p>
-                        <p class="card-text text-muted small">{{ entity.additional_files_tarball_hash }}</p>
+                        {% if entity.image_tarball_url %}
+                            <p class="card-text"><strong>Image Tarball:</strong> <a href="{{ entity.image_tarball_url }}" class="text-primary" target="_blank">{{ entity.image_tarball_url }}</a></p>
+                            <p class="card-text text-muted small">{{ entity.image_tarball_hash }}</p>
+                        {% else %}
+                            <p class="card-text"><strong>Image Tarball:</strong> Not Available</p>
+                            <p class="card-text text-muted small">N/A</p>
+                        {% endif %}
+                        {% if entity.additional_files_tarball_url %}
+                            <p class="card-text"><strong>Additional Files:</strong> <a href="{{ entity.additional_files_tarball_url }}" class="text-primary" target="_blank">{{ entity.additional_files_tarball_url }}</a></p>
+                            <p class="card-text text-muted small">{{ entity.additional_files_tarball_hash }}</p>
+                        {% else %}
+                            <p class="card-text"><strong>Additional Files:</strong> Not Available</p>
+                            <p class="card-text text-muted small">N/A</p>
+                        {% endif %}
                     </div>
                 </div>
                 <div class="card mb-3">