diff --git a/src/app/components/generator/ProjectPanel.tsx b/src/app/components/generator/ProjectPanel.tsx
index c893545a..95cec924 100644
--- a/src/app/components/generator/ProjectPanel.tsx
+++ b/src/app/components/generator/ProjectPanel.tsx
@@ -26,6 +26,7 @@ export function ProjectPanel() {
 
 	const [entries, setEntries] = useState<string[]>()
 	useEffect(() => {
+		setEntries(undefined)
 		if (!service) {
 			return
 		}
diff --git a/src/app/components/generator/SchemaGenerator.tsx b/src/app/components/generator/SchemaGenerator.tsx
index fea47e1c..f3333dd1 100644
--- a/src/app/components/generator/SchemaGenerator.tsx
+++ b/src/app/components/generator/SchemaGenerator.tsx
@@ -59,7 +59,7 @@ export function SchemaGenerator({ gen, allowedVersions }: Props) {
 	const [sharedSnippetId, setSharedSnippetId] = useSearchParam(SHARE_KEY)
 	const ignoreChange = useRef(false)
 
-	const { value: docAndNode, loading: docLoading } = useAsync(async () => {
+	const { value: docAndNode, loading: docLoading, error: docError } = useAsync(async () => {
 		let text: string | undefined = undefined
 		if (currentPreset && sharedSnippetId) {
 			setSharedSnippetId(undefined)
@@ -386,7 +386,9 @@ export function SchemaGenerator({ gen, allowedVersions }: Props) {
 				</BtnMenu>
 			</div>
 			{error && <ErrorPanel error={error} onDismiss={() => setError(null)} />}
-			<FileView docAndNode={docLoading ? undefined : docAndNode} />
+			{docError
+				? <ErrorPanel error={docError} />
+				: <FileView docAndNode={docLoading ? undefined : docAndNode} />}
 			<Footer donate={!gen.tags?.includes('partners')} />
 		</main>
 		<div class="popup-actions right-actions" style={`--offset: -${8 + actionsShown * 50}px;`}>