diff --git a/marketplace/src/context/AuthContext.tsx b/marketplace/src/context/AuthContext.tsx
index be234fe..1774afe 100644
--- a/marketplace/src/context/AuthContext.tsx
+++ b/marketplace/src/context/AuthContext.tsx
@@ -10,6 +10,7 @@ export interface AuthUser {
   name: string
   username?: string
   email?: string
+  companyId?: string
   role: UserRole
   token: string
 }
@@ -17,7 +18,7 @@ export interface AuthUser {
 interface AuthContextValue {
   user: AuthUser | null
   loading: boolean
-  login: (token: string, role: UserRole, name: string, id: string, email?: string, username?: string) => void
+  login: (token: string, role: UserRole, name: string, id: string, companyId?: string, email?: string, username?: string) => void
   logout: () => void
   setUser: (user: AuthUser) => void
 }
@@ -48,8 +49,8 @@ export function AuthProvider({ children }: { children: ReactNode }) {
     }
   }, [user])
 
-  const login = (token: string, role: UserRole, name: string, id: string, email?: string, username?: string) => {
-    setUser({ token, role, name, id, email, username })
+  const login = (token: string, role: UserRole, name: string, id: string, companyId?: string, email?: string, username?: string) => {
+    setUser({ token, role, name, id, companyId, email, username })
 
     // Redirect based on role
     switch (role) {
diff --git a/marketplace/src/pages/Login.tsx b/marketplace/src/pages/Login.tsx
index eb32385..47e2768 100644
--- a/marketplace/src/pages/Login.tsx
+++ b/marketplace/src/pages/Login.tsx
@@ -68,13 +68,13 @@ export function LoginPage() {
         throw new Error('Resposta de login inválida. Verifique o usuário e a senha.')
       }
 
-      const payload = decodeJwtPayload<{ role?: string, sub: string }>(token)
+      const payload = decodeJwtPayload<{ role?: string, sub: string, company_id?: string }>(token)
       logger.debug('🔐 [Login] JWT payload decoded:', payload)
 
       const role = resolveRole(payload?.role)
       logger.info('🔐 [Login] Role resolved:', role)
 
-      login(token, role, username, payload?.sub || '', undefined, username)
+      login(token, role, username, payload?.sub || '', payload?.company_id, undefined, username)
       logger.info('🔐 [Login] Login successful!')
     } catch (error) {
       logger.error('🔐 [Login] ERROR caught:', error)
diff --git a/marketplace/src/pages/ProductSearch.tsx b/marketplace/src/pages/ProductSearch.tsx
index cadfd3a..c8970da 100644
--- a/marketplace/src/pages/ProductSearch.tsx
+++ b/marketplace/src/pages/ProductSearch.tsx
@@ -64,11 +64,10 @@ const ProductSearch = () => {
 
     // Filter out products from the logged-in user's pharmacy and group by name
     const groupedProducts = useMemo(() => {
-        // Filter out own products - for owners/sellers, products at 0km are from their own store
-        const isOwnerOrSeller = user?.role === 'owner' || user?.role === 'seller'
+        // Filter out own products using company_id (seller_id === company_id)
         const filteredProducts = products.filter(p => {
-            // Exclude products at exactly 0km distance for owners (own store)
-            if (isOwnerOrSeller && p.distance_km === 0) {
+            // Exclude products from user's own company
+            if (user?.companyId && p.seller_id === user.companyId) {
                 return false
             }
             return true