diff --git a/apps/client/src/features/space/components/space-grid.tsx b/apps/client/src/features/space/components/space-grid.tsx
index 6f16582e..190de857 100644
--- a/apps/client/src/features/space/components/space-grid.tsx
+++ b/apps/client/src/features/space/components/space-grid.tsx
@@ -13,9 +13,9 @@ import { IconArrowRight } from "@tabler/icons-react";
 
 export default function SpaceGrid() {
   const { t } = useTranslation();
-  const { data, isLoading } = useGetSpacesQuery({ page: 1, limit: 9 });
+  const { data, isLoading } = useGetSpacesQuery({ page: 1, limit: 10 });
 
-  const cards = data?.items.map((space, index) => (
+  const cards = data?.items.slice(0, 9).map((space, index) => (
     <Card
       key={space.id}
       p="xs"
@@ -55,17 +55,19 @@ export default function SpaceGrid() {
 
       <SimpleGrid cols={{ base: 1, xs: 2, sm: 3 }}>{cards}</SimpleGrid>
       
-      <Group justify="flex-end" mt="lg">
-        <Button
-          component={Link}
-          to="/spaces"
-          variant="subtle"
-          rightSection={<IconArrowRight size={16} />}
-          size="sm"
-        >
-          {t("View all spaces")}
-        </Button>
-      </Group>
+      {data?.items && data.items.length > 9 && (
+        <Group justify="flex-end" mt="lg">
+          <Button
+            component={Link}
+            to="/spaces"
+            variant="subtle"
+            rightSection={<IconArrowRight size={16} />}
+            size="sm"
+          >
+            {t("View all spaces")}
+          </Button>
+        </Group>
+      )}
     </>
   );
 }