diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index 1ef488a7..5848aeea 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -145,11 +145,13 @@ class Markdown {
     const deflate = require('markdown-it-plantuml/lib/deflate')
     this.md.use(require('markdown-it-plantuml'), '', {
       generateSource: function (umlCode) {
+        const stripTrailingSlash = (url) => url.endsWith('/') ? url.slice(0, -1) : url
+        const serverAddress = stripTrailingSlash(config.preview.plantUMLServerAddress) + '/svg'
         const s = unescape(encodeURIComponent(umlCode))
         const zippedCode = deflate.encode64(
           deflate.zip_deflate(`@startuml\n${s}\n@enduml`, 9)
         )
-        return `http://www.plantuml.com/plantuml/svg/${zippedCode}`
+        return `${serverAddress}/${zippedCode}`
       }
     })
 
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index ee8a57c7..79fe0f5f 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -53,6 +53,7 @@ export const DEFAULT_CONFIG = {
     latexInlineClose: '$',
     latexBlockOpen: '$$',
     latexBlockClose: '$$',
+    plantUMLServerAddress: 'http://www.plantuml.com/plantuml',
     scrollPastEnd: false,
     smartQuotes: true,
     sanitize: 'STRICT' // 'STRICT', 'ALLOW_STYLES', 'NONE'
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index a607f548..1bbcb18d 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -94,6 +94,7 @@ class UiTab extends React.Component {
         latexInlineClose: this.refs.previewLatexInlineClose.value,
         latexBlockOpen: this.refs.previewLatexBlockOpen.value,
         latexBlockClose: this.refs.previewLatexBlockClose.value,
+        plantUMLServerAddress: this.refs.previewPlantUMLServerAddress.value,
         scrollPastEnd: this.refs.previewScrollPastEnd.checked,
         smartQuotes: this.refs.previewSmartQuotes.checked,
         sanitize: this.refs.previewSanitize.value
@@ -544,6 +545,19 @@ class UiTab extends React.Component {
               />
             </div>
           </div>
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>
+              {i18n.__('PlantUML Server')}
+            </div>
+            <div styleName='group-section-control'>
+              <input styleName='group-section-control-input'
+                ref='previewPlantUMLServerAddress'
+                value={config.preview.plantUMLServerAddress}
+                onChange={(e) => this.handleUIChange(e)}
+                type='text'
+              />
+            </div>
+          </div>
 
           <div styleName='group-control'>
             <button styleName='group-control-rightButton'
diff --git a/locales/da.json b/locales/da.json
index 51f975d9..314058cb 100644
--- a/locales/da.json
+++ b/locales/da.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX Inline Close Delimiter",
 	"LaTeX Block Open Delimiter": "LaTeX Block Open Delimiter",
 	"LaTeX Block Close Delimiter": "LaTeX Block Close Delimiter",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Community",
 	"Subscribe to Newsletter": "Subscribe to Newsletter",
 	"GitHub": "GitHub",
diff --git a/locales/de.json b/locales/de.json
index f0c11b16..7e7da1f3 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX Inline Ende Kennzeichen",
 	"LaTeX Block Open Delimiter": "LaTeX Block Beginn Kennzeichen",
 	"LaTeX Block Close Delimiter": "LaTeX Block Ende Kennzeichen",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Community",
 	"Subscribe to Newsletter": "Newsletter abonnieren",
 	"GitHub": "GitHub",
diff --git a/locales/en.json b/locales/en.json
index b8250ea7..912ecf2f 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX Inline Close Delimiter",
 	"LaTeX Block Open Delimiter": "LaTeX Block Open Delimiter",
 	"LaTeX Block Close Delimiter": "LaTeX Block Close Delimiter",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Community",
 	"Subscribe to Newsletter": "Subscribe to Newsletter",
 	"GitHub": "GitHub",
diff --git a/locales/es-ES.json b/locales/es-ES.json
index d533579c..0fa27713 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "Delimitador de cierre LaTeX en línea",
 	"LaTeX Block Open Delimiter": "Delimitado de apertura bloque LaTeX",
 	"LaTeX Block Close Delimiter": "Delimitador de cierre bloque LaTeX",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Comunidad",
 	"Subscribe to Newsletter": "Suscribirse al boletín",
 	"GitHub": "GitHub",
diff --git a/locales/fa.json b/locales/fa.json
index e0aa1978..125056a6 100644
--- a/locales/fa.json
+++ b/locales/fa.json
@@ -62,6 +62,7 @@
     "LaTeX Inline Close Delimiter": "جداکننده پایانی لاتکس خطی",
     "LaTeX Block Open Delimiter": "جداکننده آغازین بلوک لاتکس ",
     "LaTeX Block Close Delimiter": "جداکننده آغازین بلوک لاتکس ",
+    "PlantUML Server": "PlantUML Server",
     "Community": "کامینیتی",
     "Subscribe to Newsletter": "اشتراک در خبرنامه",
     "GitHub": "گیت هاب",
diff --git a/locales/fr.json b/locales/fr.json
index dc53ff24..d285a29c 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -61,6 +61,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX Inline Close Delimiter",
 	"LaTeX Block Open Delimiter": "LaTeX Block Open Delimiter",
 	"LaTeX Block Close Delimiter": "LaTeX Block Close Delimiter",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Communauté",
 	"Subscribe to Newsletter": "Souscrire à la newsletter",
 	"GitHub": "GitHub",
diff --git a/locales/hu.json b/locales/hu.json
index 74cd5d04..21f1bc16 100644
--- a/locales/hu.json
+++ b/locales/hu.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX Inline Záró Határolója",
 	"LaTeX Block Open Delimiter": "LaTeX Blokk Nyitó Határolója",
 	"LaTeX Block Close Delimiter": "LaTeX Blokk Záró Határolója",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Közösség",
 	"Subscribe to Newsletter": "Feliratkozás a Hírlevélre",
 	"GitHub": "GitHub",
diff --git a/locales/it.json b/locales/it.json
index bfb09691..10c97c94 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "Delimitatore inline per chiusura LaTex",
 	"LaTeX Block Open Delimiter": "Delimitatore apertura LaTex",
 	"LaTeX Block Close Delimiter": "Delimitatore chiusura LaTex",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Community",
 	"Subscribe to Newsletter": "Iscriviti alla Newsletter",
 	"GitHub": "GitHub",
diff --git a/locales/ja.json b/locales/ja.json
index cf0bb0dd..987f11e5 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX 終了デリミタ（インライン）",
 	"LaTeX Block Open Delimiter": "LaTeX 開始デリミタ（ブロック）",
 	"LaTeX Block Close Delimiter": "LaTeX 終了デリミタ（ブロック）",
+	"PlantUML Server": "PlantUML サーバー",
 	"Community": "コミュニティ",
 	"Subscribe to Newsletter": "ニュースレターを購読する",
 	"GitHub": "GitHub",
diff --git a/locales/ko.json b/locales/ko.json
index 38eaa0f9..d0feaebd 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX 인라인 블록 닫기 기호",
 	"LaTeX Block Open Delimiter": "LaTeX 블록 열기 기호",
 	"LaTeX Block Close Delimiter": "LaTeX 블록 닫기 기호",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "커뮤니티",
 	"Subscribe to Newsletter": "뉴스레터 구독",
 	"GitHub": "깃허브",
diff --git a/locales/no.json b/locales/no.json
index 01a6fe0b..1ec74f0e 100644
--- a/locales/no.json
+++ b/locales/no.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX Inline Close Delimiter",
 	"LaTeX Block Open Delimiter": "LaTeX Block Open Delimiter",
 	"LaTeX Block Close Delimiter": "LaTeX Block Close Delimiter",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Community",
 	"Subscribe to Newsletter": "Subscribe to Newsletter",
 	"GitHub": "GitHub",
diff --git a/locales/pl.json b/locales/pl.json
index 01a6fe0b..1ec74f0e 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX Inline Close Delimiter",
 	"LaTeX Block Open Delimiter": "LaTeX Block Open Delimiter",
 	"LaTeX Block Close Delimiter": "LaTeX Block Close Delimiter",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Community",
 	"Subscribe to Newsletter": "Subscribe to Newsletter",
 	"GitHub": "GitHub",
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
index 10fade1f..1f8361af 100644
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "Delimitador em Linha Fechado do LaTeX",
 	"LaTeX Block Open Delimiter": "Delimitador de Bloco Aberto do LaTeX",
 	"LaTeX Block Close Delimiter": "Delimitador de Bloco Fechado do LaTeX",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Comunidade",
 	"Subscribe to Newsletter": "Subscrever à Newsletter",
 	"GitHub": "GitHub",
diff --git a/locales/pt-PT.json b/locales/pt-PT.json
index 01a6fe0b..1ec74f0e 100644
--- a/locales/pt-PT.json
+++ b/locales/pt-PT.json
@@ -62,6 +62,7 @@
 	"LaTeX Inline Close Delimiter": "LaTeX Inline Close Delimiter",
 	"LaTeX Block Open Delimiter": "LaTeX Block Open Delimiter",
 	"LaTeX Block Close Delimiter": "LaTeX Block Close Delimiter",
+	"PlantUML Server": "PlantUML Server",
 	"Community": "Community",
 	"Subscribe to Newsletter": "Subscribe to Newsletter",
 	"GitHub": "GitHub",