diff --git a/src/components/Assets/AssetsList.tsx b/src/components/Assets/AssetsList.tsx
index eceee4887e8..c2a73399d83 100644
--- a/src/components/Assets/AssetsList.tsx
+++ b/src/components/Assets/AssetsList.tsx
@@ -210,7 +210,7 @@ const AssetsList = () => {
);
let manageAssets = null;
- if (loading) {
+ if (loading || !assetsExist) {
manageAssets = (
diff --git a/src/components/Patient/SampleDetails.tsx b/src/components/Patient/SampleDetails.tsx
index c5282a65c1f..dd7b3f20535 100644
--- a/src/components/Patient/SampleDetails.tsx
+++ b/src/components/Patient/SampleDetails.tsx
@@ -264,7 +264,10 @@ export const SampleDetails = ({ id }: DetailRoute) => {
const renderFlow = (flow: FlowModel) => {
return (
-
+