diff --git a/components/features/queue/PatientCard.vue b/components/features/queue/PatientCard.vue
index d473e2a..68f7ec1 100644
--- a/components/features/queue/PatientCard.vue
+++ b/components/features/queue/PatientCard.vue
@@ -33,13 +33,24 @@
                 </v-icon>
               </div>
             </div>
-            <v-chip
-              :color="getStatusColor(patient.status)"
-              size="small"
-              class="status-chip"
-            >
-              {{ getStatusLabel(patient.status) }}
-            </v-chip>
+            <div class="header-right d-flex align-center" style="gap: 8px;">
+              <v-chip
+                v-if="patient.ruang"
+                color="primary-600"
+                variant="outlined"
+                size="small"
+                class="subspesialis-chip text-caption font-weight-bold"
+              >
+                {{ patient.ruang }}
+              </v-chip>
+              <v-chip
+                :color="getStatusColor(patient.status)"
+                size="small"
+                class="status-chip"
+              >
+                {{ getStatusLabel(patient.status) }}
+              </v-chip>
+            </div>
           </div>
 
           <!-- Patient Info - Compact Single Row -->
diff --git a/pages/Anjungan/AntrianKlinikRuang/index.vue b/pages/Anjungan/AntrianKlinikRuang/index.vue
index 6c88d7f..9a94777 100644
--- a/pages/Anjungan/AntrianKlinikRuang/index.vue
+++ b/pages/Anjungan/AntrianKlinikRuang/index.vue
@@ -20,9 +20,9 @@
 
     <ClientOnly>
       <div class="klinik-selection-container">
-        <div v-if="visibleKliniks.length > 0" class="kliniks-grid">
+        <div v-if="kliniksWithRuang.length > 0" class="kliniks-grid">
         <div
-          v-for="klinik in visibleKliniks"
+          v-for="klinik in kliniksWithRuang"
           :key="klinik.id"
           class="klinik-card"
           @click="navigateToKlinik(klinik)"
@@ -84,8 +84,6 @@
           </div>
         </div>
         
-        <!-- Sentinel for Infinite Scroll (placed inside the row but spanning full width) -->
-        <div ref="targetRef" class="sentinel" style="height: 20px; width: 100%; grid-column: 1 / -1;"></div>
       </div>
 
         <div v-else class="empty-state">
@@ -117,7 +115,6 @@ import { ref, computed, onMounted } from 'vue';
 import { useMasterStore } from '@/stores/masterStore';
 import { useClinicStore } from '@/stores/clinicStore';
 import { useRuangStore } from '@/stores/ruangStore';
-import { useInfiniteScroll } from '@/composables/useInfiniteScroll';
 import { useRoute } from '#app';
 
 definePageMeta({
@@ -135,9 +132,6 @@ const kliniksWithRuang = computed(() => {
   return [...list].sort((a, b) => a.namaKlinik.localeCompare(b.namaKlinik));
 });
 
-// Infinite Scroll
-const { visibleItems: visibleKliniks, targetRef, hasMore } = useInfiniteScroll(kliniksWithRuang, 12);
-
 // Deprecated: Pagination logic removed