diff --git a/backend/internal/device/service.go b/backend/internal/device/service.go
index 6effb74..6f733a4 100644
--- a/backend/internal/device/service.go
+++ b/backend/internal/device/service.go
@@ -38,12 +38,20 @@ func (s *Service) Enroll(ctx context.Context, userID uuid.UUID, input EnrollRequ
 		return EnrollmentResponse{}, err
 	}
 
-	enrollment, err := s.repo.Enroll(ctx, userID, selectedGateway.ID, input, assignedIP, selectedGateway.DNSServers, nil)
+	destinations, err := s.policyService.ResolveDestinations(ctx, userID, nil)
+	if err != nil {
+		return EnrollmentResponse{}, err
+	}
+	if len(destinations) == 0 {
+		destinations = []string{"172.16.10.0/24"}
+	}
+
+	enrollment, err := s.repo.Enroll(ctx, userID, selectedGateway.ID, input, assignedIP, selectedGateway.DNSServers, destinations)
 	if err != nil {
 		return EnrollmentResponse{}, err
 	}
 
-	destinations, err := s.policyService.ResolveDestinations(ctx, userID, &enrollment.Device.ID)
+	destinations, err = s.policyService.ResolveDestinations(ctx, userID, &enrollment.Device.ID)
 	if err != nil {
 		return EnrollmentResponse{}, err
 	}