diff --git a/app/scripts/modules/amazon/src/serverGroup/AvailabilityZoneSelector.tsx b/app/scripts/modules/amazon/src/serverGroup/AvailabilityZoneSelector.tsx
index d103f0cc2ec..97c8eda0cf2 100644
--- a/app/scripts/modules/amazon/src/serverGroup/AvailabilityZoneSelector.tsx
+++ b/app/scripts/modules/amazon/src/serverGroup/AvailabilityZoneSelector.tsx
@@ -37,11 +37,13 @@ export class AvailabilityZoneSelector extends React.Component<
   }
 
   private setDefaultZones(props: IAvailabilityZoneSelectorProps) {
-    const { credentials, onChange, region } = props;
+    const { credentials, onChange, region, usePreferredZones } = props;
 
     AccountService.getAvailabilityZonesForAccountAndRegion('aws', credentials, region).then(preferredZones => {
       this.setState({ defaultZones: preferredZones });
-      return preferredZones && onChange(preferredZones.slice());
+      if (usePreferredZones && preferredZones) {
+        onChange(preferredZones.slice());
+      }
     });
   }