diff --git a/lib/nodes/addon/components/driver-amazonec2/component.js b/lib/nodes/addon/components/driver-amazonec2/component.js
index 4369182d0..19d52489e 100644
--- a/lib/nodes/addon/components/driver-amazonec2/component.js
+++ b/lib/nodes/addon/components/driver-amazonec2/component.js
@@ -307,7 +307,11 @@ export default Component.extend(NodeDriver, {
     }).sort().uniq();
 
     if ( choices.length ) {
-      set(this, 'selectedZone', choices[0]);
+      if ( get(this, 'config.zone.length') ) {
+        set(this, 'selectedZone', `${ get(this, 'config.region') }${ get(this, 'config.zone') }`);
+      } else {
+        set(this, 'selectedZone', choices[0]);
+      }
     }
 
     return choices;