diff --git a/src/js/sw/surfaces/settings/general.js b/src/js/sw/surfaces/settings/general.js
index 004b7e0..688ed6b 100644
--- a/src/js/sw/surfaces/settings/general.js
+++ b/src/js/sw/surfaces/settings/general.js
@@ -18,7 +18,7 @@ export function GeneralSection() {
                 ]);
                 const sObj = s || {};
                 setDefaultSurface(sObj.default_surface || '');
-                setSurfaces((surfList || []).filter(s => s.source !== 'core' && s.enabled));
+                setSurfaces((surfList || []).filter(s => s.route?.startsWith('/s/')));
             } catch (e) {
                 console.warn('[settings/general] Load failed:', e.message);
             }
diff --git a/src/js/sw/surfaces/welcome/index.js b/src/js/sw/surfaces/welcome/index.js
index be9fa7d..31af6ff 100644
--- a/src/js/sw/surfaces/welcome/index.js
+++ b/src/js/sw/surfaces/welcome/index.js
@@ -16,7 +16,7 @@ function WelcomeSurface() {
 
     useEffect(() => {
         sw.api.get('/api/v1/surfaces').then(list => {
-            setSurfaces((list || []).filter(s => s.source !== 'core'));
+            setSurfaces((list || []).filter(s => s.route?.startsWith('/s/')));
         }).catch(() => {});
     }, []);