diff --git a/internal/handler/table_handler.go b/internal/handler/table_handler.go
index 12566da..e22aea9 100644
--- a/internal/handler/table_handler.go
+++ b/internal/handler/table_handler.go
@@ -133,15 +133,16 @@ func (h *TableHandler) Delete(c *gin.Context) {
 
 func (h *TableHandler) List(c *gin.Context) {
 	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
 
 	query := contract.ListTablesQuery{
-		OrganizationID: c.Query("organization_id"),
+		OrganizationID: contextInfo.OrganizationID.String(),
 		OutletID:       c.Query("outlet_id"),
 		Status:         c.Query("status"),
 		IsActive:       c.Query("is_active"),
 		Search:         c.Query("search"),
 		Page:           1,
-		Limit:          10,
+		Limit:          100,
 	}
 
 	if pageStr := c.Query("page"); pageStr != "" {