diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index a2cbab72ebe..c5e0ddb2364 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -517,7 +517,16 @@
                                             return elem.id == val;
                                         })[0];
 
-                                        if (!item) return true;
+                                        if (!item) {
+                                        	// handle removal of custom size controls
+                                            $step.find('.section.custom-size').hide();
+                                            $step.removeClass('custom-disk-size');
+
+                                            // handle removal of custom IOPS controls
+                                            $step.removeClass('custom-iops-do');
+
+                                            return true;
+                                        }
 
                                         var custom = item[args.customFlag];