diff --git a/admin/src/react-components/service-editor.js b/admin/src/react-components/service-editor.js
index dcbb811d65..10348f8ae8 100644
--- a/admin/src/react-components/service-editor.js
+++ b/admin/src/react-components/service-editor.js
@@ -459,6 +459,7 @@ class ConfigurationEditor extends Component {
               className={this.props.classes.button}
               variant="contained"
               color="primary"
+              disabled={this.state.warningMessage}
             >
               Save
             </Button>