diff --git a/backend/internal/api/handlers/tenant.go b/backend/internal/api/handlers/tenant.go
index 45327ed..f0692fa 100644
--- a/backend/internal/api/handlers/tenant.go
+++ b/backend/internal/api/handlers/tenant.go
@@ -56,15 +56,14 @@ func (h *TenantHandler) CheckExists(w http.ResponseWriter, r *http.Request) {
 
 	tenant, err := h.tenantService.GetBySubdomain(subdomain)
 	if err != nil {
+		if err == service.ErrTenantNotFound {
+			http.NotFound(w, r)
+			return
+		}
 		http.Error(w, "Internal server error", http.StatusInternalServerError)
 		return
 	}
 
-	if tenant == nil {
-		http.NotFound(w, r)
-		return
-	}
-
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	json.NewEncoder(w).Encode(map[string]string{"status": "ok"})
 }
diff --git a/backend/internal/service/tenant_service.go b/backend/internal/service/tenant_service.go
index f3a4d02..b3d971e 100644
--- a/backend/internal/service/tenant_service.go
+++ b/backend/internal/service/tenant_service.go
@@ -79,11 +79,6 @@ func (s *TenantService) ListAll() ([]*domain.Tenant, error) {
 	return s.tenantRepo.FindAll()
 }
 
-// GetBySubdomain returns tenant by subdomain or nil
-func (s *TenantService) GetBySubdomain(subdomain string) (*domain.Tenant, error) {
-	return s.tenantRepo.FindBySubdomain(subdomain)
-}
-
 // Delete removes a tenant by ID
 func (s *TenantService) Delete(id uuid.UUID) error {
 	if err := s.tenantRepo.Delete(id); err != nil {