diff --git a/src/main/java/cz/cvut/kbss/termit/service/business/TermService.java b/src/main/java/cz/cvut/kbss/termit/service/business/TermService.java
index 35b92fa5..b22bc1e6 100644
--- a/src/main/java/cz/cvut/kbss/termit/service/business/TermService.java
+++ b/src/main/java/cz/cvut/kbss/termit/service/business/TermService.java
@@ -408,7 +408,6 @@ public Term update(Term term) {
         checkForInvalidTerminalStateAssignment(original, term.getState());
         // Ensure the change is merged into the repo before analyzing other terms
         final Term result = repositoryService.update(term);
-
         // if the label changed, run analysis on all terms in the vocabulary
         if (!Objects.equals(original.getLabel(), result.getLabel())) {
             vocabularyService.runTextAnalysisOnAllTerms(getVocabularyReference(result.getVocabulary()));
diff --git a/src/main/java/cz/cvut/kbss/termit/util/Configuration.java b/src/main/java/cz/cvut/kbss/termit/util/Configuration.java
index fdbcfa4b..e066fe44 100644
--- a/src/main/java/cz/cvut/kbss/termit/util/Configuration.java
+++ b/src/main/java/cz/cvut/kbss/termit/util/Configuration.java
@@ -668,6 +668,8 @@ public static class TextAnalysis {
         @Min(8)
         private int textQuoteSelectorContextLength = 32;
 
+        private boolean disableVocabularyAnalysisOnTermEdit = false;
+
         public String getUrl() {
             return url;
         }
@@ -691,6 +693,14 @@ public int getTextQuoteSelectorContextLength() {
         public void setTextQuoteSelectorContextLength(int textQuoteSelectorContextLength) {
             this.textQuoteSelectorContextLength = textQuoteSelectorContextLength;
         }
+
+        public boolean isDisableVocabularyAnalysisOnTermEdit() {
+            return disableVocabularyAnalysisOnTermEdit;
+        }
+
+        public void setDisableVocabularyAnalysisOnTermEdit(boolean disableVocabularyAnalysisOnTermEdit) {
+            this.disableVocabularyAnalysisOnTermEdit = disableVocabularyAnalysisOnTermEdit;
+        }
     }
 
     @Validated