diff --git a/apps/client/src/features/editor/components/embed/embed-view.tsx b/apps/client/src/features/editor/components/embed/embed-view.tsx
index 27ce21d9..77743a07 100644
--- a/apps/client/src/features/editor/components/embed/embed-view.tsx
+++ b/apps/client/src/features/editor/components/embed/embed-view.tsx
@@ -98,7 +98,7 @@ export default function EmbedView(props: NodeViewProps) {
 
                 <Text component="span" size="lg" c="dimmed">
                   {t("Embed {{provider}}", {
-                    provider: getEmbedProviderById(provider).name,
+                    provider: getEmbedProviderById(provider)?.name,
                   })}
                 </Text>
               </div>
diff --git a/apps/client/src/features/page/components/page-import-modal.tsx b/apps/client/src/features/page/components/page-import-modal.tsx
index dc81b02c..3cf75918 100644
--- a/apps/client/src/features/page/components/page-import-modal.tsx
+++ b/apps/client/src/features/page/components/page-import-modal.tsx
@@ -92,6 +92,8 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
     }
 
     try {
+      onClose();
+
       notifications.show({
         id: "import",
         message: t("Uploading import file"),
@@ -101,7 +103,7 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
       });
 
       const importTask = await importZip(selectedFile, spaceId, source);
-      notifications.show({
+      notifications.update({
         id: "import",
         title: t("Importing pages"),
         message: t("Page import is in progress."),