diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
index 4dd0f5aeb4d..902570e8b59 100644
--- a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -177,12 +177,11 @@
       );
 
       // If we're filtering a particular facility
-      if (Object.keys(facilityFilter).length > 0) {
+      if (Object.keys(facilityFilter).length > 0 || props.filterByHasFacilities) {
         apiParams.subset_of_users_device = false;
+        deviceFilters.push(useDeviceFacilityFilter(facilityFilter));
       }
 
-      deviceFilters.push(useDeviceFacilityFilter(facilityFilter));
-
       if (props.filterLODAvailable) {
         apiParams.subset_of_users_device = false;
         deviceFilters.push(useDeviceMinimumVersionFilter(0, 15, 0));