diff --git a/src/app/private-library/page.tsx b/src/app/private-library/page.tsx
index 2d248d2..d006d30 100644
--- a/src/app/private-library/page.tsx
+++ b/src/app/private-library/page.tsx
@@ -9,7 +9,7 @@ import CapsuleSwitch from '@/components/CapsuleSwitch';
 import PageLayout from '@/components/PageLayout';
 import VideoCard from '@/components/VideoCard';
 
-type LibrarySourceType = 'openlist' | 'emby';
+type LibrarySourceType = 'openlist' | 'emby' | `emby:${string}` | `emby_${string}`;
 
 interface EmbySourceOption {
   key: string;
diff --git a/src/components/VideoCard.tsx b/src/components/VideoCard.tsx
index f53e430..5e437e6 100644
--- a/src/components/VideoCard.tsx
+++ b/src/components/VideoCard.tsx
@@ -1219,7 +1219,7 @@ const VideoCard = forwardRef<VideoCardHandle, VideoCardProps>(function VideoCard
                       {config.showSourceName && source_name && !cmsData && (
                         <span
                           className={`inline-block border rounded px-1 py-0.5 text-[8px] text-white/90 bg-black/30 backdrop-blur-sm ${
-                            actualSource === 'openlist' || actualSource === 'emby' || actualSource.startsWith('emby_') ? 'border-yellow-500' : 'border-white/60'
+                            actualSource === 'openlist' || actualSource === 'emby' || actualSource?.startsWith('emby_') ? 'border-yellow-500' : 'border-white/60'
                           }`}
                           style={{
                             WebkitUserSelect: 'none',
@@ -1269,7 +1269,7 @@ const VideoCard = forwardRef<VideoCardHandle, VideoCardProps>(function VideoCard
                   <div className='flex items-center justify-end'>
                     <span
                       className={`inline-block border rounded px-1 py-0.5 text-[8px] text-white/90 bg-black/30 backdrop-blur-sm ${
-                        origin === 'live' ? 'border-red-500' : actualSource === 'openlist' || actualSource === 'emby' || actualSource.startsWith('emby_') ? 'border-yellow-500' : 'border-white/60'
+                        origin === 'live' ? 'border-red-500' : actualSource === 'openlist' || actualSource === 'emby' || actualSource?.startsWith('emby_') ? 'border-yellow-500' : 'border-white/60'
                       }`}
                       style={{
                         WebkitUserSelect: 'none',
diff --git a/src/lib/config.ts b/src/lib/config.ts
index dfb1632..0cb0eb1 100644
--- a/src/lib/config.ts
+++ b/src/lib/config.ts
@@ -503,7 +503,7 @@ export function configSelfCheck(adminConfig: AdminConfig): AdminConfig {
           key: 'default',
           name: 'Emby',
           enabled: oldConfig.Enabled ?? false,
-          ServerURL: oldConfig.ServerURL,
+          ServerURL: oldConfig.ServerURL || '',
           ApiKey: oldConfig.ApiKey,
           Username: oldConfig.Username,
           Password: oldConfig.Password,
@@ -518,7 +518,7 @@ export function configSelfCheck(adminConfig: AdminConfig): AdminConfig {
     }
 
     // Emby源去重
-    if (adminConfig.EmbyConfig.Sources) {
+    if (adminConfig.EmbyConfig?.Sources) {
       const seenEmbyKeys = new Set<string>();
       adminConfig.EmbyConfig.Sources = adminConfig.EmbyConfig.Sources.filter((source) => {
         if (seenEmbyKeys.has(source.key)) {
diff --git a/src/lib/emby-manager.ts b/src/lib/emby-manager.ts
index 8d1b706..450d820 100644
--- a/src/lib/emby-manager.ts
+++ b/src/lib/emby-manager.ts
@@ -164,7 +164,7 @@ export function migrateEmbyConfig(config: AdminConfig): AdminConfig {
         key: 'default',
         name: 'Emby',
         enabled: oldConfig.Enabled ?? false,
-        ServerURL: oldConfig.ServerURL,
+        ServerURL: oldConfig.ServerURL || '',
         ApiKey: oldConfig.ApiKey,
         Username: oldConfig.Username,
         Password: oldConfig.Password,