diff --git a/backend/alwrity_utils/feature_registry.py b/backend/alwrity_utils/feature_registry.py
index f7bd6119..f2a6dbd0 100644
--- a/backend/alwrity_utils/feature_registry.py
+++ b/backend/alwrity_utils/feature_registry.py
@@ -62,6 +62,17 @@ FEATURE_GROUPS: Dict[str, FeatureGroup] = {
         features=("backlinking",),
         routers=("routers.backlink_outreach:router",),
     ),
+    "linkedin": FeatureGroup(
+        features=("linkedin",),
+        routers=(
+            "routers.linkedin:router",
+            "api.linkedin_image_generation:router",
+        ),
+    ),
+    "facebook": FeatureGroup(
+        features=("facebook",),
+        routers=("api.facebook_writer.routers:facebook_router",),
+    ),
 }
 
 
@@ -72,5 +83,7 @@ PROFILE_GROUP_MAP: Dict[str, Tuple[str, ...]] = {
     "youtube": ("core", "youtube"),
     "blog_writer": ("core", "blog_writer"),
     "backlinking": ("core", "backlinking"),
+    "linkedin": ("core", "linkedin"),
+    "facebook": ("core", "facebook"),
     "planning": ("core", "content_planning"),
 }
diff --git a/backend/app.py b/backend/app.py
index 4b5d157c..346a0983 100644
--- a/backend/app.py
+++ b/backend/app.py
@@ -126,12 +126,8 @@ seo_tools_router = None
 if _is_full_mode():
     from routers.seo_tools import router as seo_tools_router
 
-# Skip Facebook Writer, LinkedIn, and other non-essential routes in feature-only modes
-# Also skip other heavy services that trigger PersonaAnalysisService initialization
+# Skip heavy services in feature-only modes (PersonaAnalysisService, etc.)
 if _is_full_mode():
-    from api.facebook_writer.routers import facebook_router
-    from routers.linkedin import router as linkedin_router
-    from api.linkedin_image_generation import router as linkedin_image_router
     from api.brainstorm import router as brainstorm_router
     from api.images import router as images_router
     from api.assets_serving import router as assets_serving_router
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 43066444..deeaa231 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -195,8 +195,8 @@ const App: React.FC = () => {
                     <Route path="/seo-dashboard" element={<ProtectedRoute><FeatureRoute feature="seo"><SEODashboard /></FeatureRoute></ProtectedRoute>} />
                     <Route path="/backlink-outreach" element={<ProtectedRoute><FeatureRoute feature="backlinking"><BacklinkOutreachDashboard /></FeatureRoute></ProtectedRoute>} />
                     <Route path="/content-planning" element={<ProtectedRoute><FeatureRoute feature="content-planning"><ContentPlanningDashboard /></FeatureRoute></ProtectedRoute>} />
-                    <Route path="/facebook-writer" element={<ProtectedRoute><FeatureRoute feature="social"><FacebookWriter /></FeatureRoute></ProtectedRoute>} />
-                    <Route path="/linkedin-writer" element={<ProtectedRoute><FeatureRoute feature="social"><LinkedInWriter /></FeatureRoute></ProtectedRoute>} />
+                    <Route path="/facebook-writer" element={<ProtectedRoute><FeatureRoute feature="facebook"><FacebookWriter /></FeatureRoute></ProtectedRoute>} />
+                    <Route path="/linkedin-writer" element={<ProtectedRoute><FeatureRoute feature="linkedin"><LinkedInWriter /></FeatureRoute></ProtectedRoute>} />
                     <Route path="/blog-writer" element={<ProtectedRoute><FeatureRoute feature="blog_writer"><BlogWriter /></FeatureRoute></ProtectedRoute>} />
                     <Route path="/story-writer" element={<ProtectedRoute><FeatureRoute feature="story"><StoryWriter /></FeatureRoute></ProtectedRoute>} />
                     <Route path="/story-projects" element={<ProtectedRoute><FeatureRoute feature="story"><StoryProjectList /></FeatureRoute></ProtectedRoute>} />
diff --git a/frontend/src/utils/demoMode.ts b/frontend/src/utils/demoMode.ts
index 2d156c40..35e6a82b 100644
--- a/frontend/src/utils/demoMode.ts
+++ b/frontend/src/utils/demoMode.ts
@@ -16,6 +16,8 @@ export const FEATURE_KEYS = {
   SEO: 'seo',
   CONTENT_PLANNING: 'content-planning',
   SOCIAL: 'social',
+  LINKEDIN: 'linkedin',
+  FACEBOOK: 'facebook',
   BLOG_WRITER: 'blog_writer',
   STORY: 'story',
   YOUTUBE: 'youtube',
@@ -126,6 +128,8 @@ const FEATURE_ROUTE_PRIORITY: [string, string][] = [
   ['podcast', '/podcast-maker'],
   ['blog_writer', '/blog-writer'],
   ['backlinking', '/backlink-outreach'],
+  ['linkedin', '/linkedin-writer'],
+  ['facebook', '/facebook-writer'],
   ['story', '/story-writer'],
   ['image', '/image-studio'],
   ['video', '/video-studio'],