diff --git a/src/pages/AvailabilityPage.tsx b/src/pages/AvailabilityPage.tsx
index b81906b..1e28ae6 100644
--- a/src/pages/AvailabilityPage.tsx
+++ b/src/pages/AvailabilityPage.tsx
@@ -693,6 +693,7 @@ export function AvailabilityPage() {
       api.rateOverrides.list(slug).catch(() => []),
     ]).then(([cats, rooms, apiPeriods, apiOverrides]) => {
       // Build AvailabilityCat[] from real categories, derive basePrice from rooms
+      const colors = ['#6366f1','#10b981','#f59e0b','#ef4444','#8b5cf6','#06b6d4']
       const availCats: AvailabilityCat[] = cats.map(cat => {
         const catRooms = rooms.filter(r => r.categoryId === cat.id)
         const basePrice = catRooms.length > 0
@@ -702,8 +703,7 @@ export function AvailabilityPage() {
       })
 
       // If no categories, fall back to room types as groups
-      const colors = ['#6366f1','#10b981','#f59e0b','#ef4444','#8b5cf6','#06b6d4']
-      const finalCats = availCats.length > 0 ? availCats : (() => {
+      let finalCats: AvailabilityCat[] = availCats.length > 0 ? availCats : (() => {
         const typeMap = new Map<string, number>()
         for (const r of rooms) {
           if (!r.type) continue
@@ -716,6 +716,19 @@ export function AvailabilityPage() {
         }))
       })()
 
+      // Add "Без категории" group for rooms not assigned to any category
+      const assignedCatIds = new Set(cats.map(c => c.id))
+      const uncategorized = rooms.filter(r => !r.categoryId || !assignedCatIds.has(r.categoryId))
+      if (uncategorized.length > 0) {
+        const basePrice = Math.min(...uncategorized.map(r => r.baseRate))
+        finalCats = [...finalCats, {
+          id: '__no_category__',
+          name: 'Без категории',
+          color: '#94a3b8',
+          basePrice,
+        }]
+      }
+
       setRoomCategories(finalCats)
 
       // Build initial grid then apply saved overrides on top
@@ -798,34 +811,36 @@ export function AvailabilityPage() {
       ? roomCategories.filter(c => c.id === onlyCategoryId)
       : roomCategories
 
+    // Build overrides BEFORE setPrices (updater runs async, can't rely on side-effects inside it)
     const overrides: Array<{
       category_id: string; date: string; price: number
       extra_person: number; min_nights: number
       channel_prices: Record<string, number>; closed: boolean
     }> = []
 
+    for (const cat of catsToUpdate) {
+      const basePrice = categoryPrices[cat.id] ?? cat.basePrice
+      for (const d of days) {
+        const channelPrices: Record<string, number> = {}
+        for (const ch of RATE_CHANNELS) {
+          channelPrices[ch.id] = Math.round(basePrice * (channelMarkup[ch.id] ?? 1))
+        }
+        overrides.push({
+          category_id: cat.id, date: d, price: basePrice,
+          extra_person: extraPerson, min_nights: minNights,
+          channel_prices: channelPrices, closed,
+        })
+      }
+    }
+
     setPrices(prev => {
       const next = { ...prev }
-      for (const cat of catsToUpdate) {
-        next[cat.id] = { ...prev[cat.id] }
-        const basePrice = categoryPrices[cat.id] ?? cat.basePrice
-        for (const d of days) {
-          const channelPrices: Record<string, number> = {}
-          for (const ch of RATE_CHANNELS) {
-            channelPrices[ch.id] = Math.round(basePrice * (channelMarkup[ch.id] ?? 1))
-          }
-          next[cat.id][d] = {
-            price: basePrice, extraPerson, minNights, channelPrices, closed,
-          }
-          overrides.push({
-            category_id: cat.id,
-            date: d,
-            price: basePrice,
-            extra_person: extraPerson,
-            min_nights: minNights,
-            channel_prices: channelPrices,
-            closed,
-          })
+      for (const o of overrides) {
+        if (!next[o.category_id]) next[o.category_id] = {}
+        next[o.category_id] = { ...next[o.category_id] }
+        next[o.category_id][o.date] = {
+          price: o.price, extraPerson: o.extra_person, minNights: o.min_nights,
+          channelPrices: o.channel_prices, closed: o.closed,
         }
       }
       return next