diff --git a/src/main/ipc-handlers/connection.js b/src/main/ipc-handlers/connection.js
index 696aeb99..3a0019aa 100644
--- a/src/main/ipc-handlers/connection.js
+++ b/src/main/ipc-handlers/connection.js
@@ -24,7 +24,8 @@ export default connections => {
             key: conn.key ? fs.readFileSync(conn.key) : null,
             cert: conn.cert ? fs.readFileSync(conn.cert) : null,
             ca: conn.ca ? fs.readFileSync(conn.ca) : null,
-            ciphers: conn.ciphers
+            ciphers: conn.ciphers,
+            rejectUnauthorized: !conn.untrustedConnection
          };
       }
 
@@ -84,7 +85,8 @@ export default connections => {
             key: conn.key ? fs.readFileSync(conn.key) : null,
             cert: conn.cert ? fs.readFileSync(conn.cert) : null,
             ca: conn.ca ? fs.readFileSync(conn.ca) : null,
-            ciphers: conn.ciphers
+            ciphers: conn.ciphers,
+            rejectUnauthorized: !conn.untrustedConnection
          };
       }
 
diff --git a/src/renderer/components/WorkspaceAddConnectionPanel.vue b/src/renderer/components/WorkspaceAddConnectionPanel.vue
index 24ba79ec..6087dba3 100644
--- a/src/renderer/components/WorkspaceAddConnectionPanel.vue
+++ b/src/renderer/components/WorkspaceAddConnectionPanel.vue
@@ -253,6 +253,14 @@
                            >
                         </div>
                      </div>
+                     <div class="form-group columns">
+                        <div class="column col-4 col-sm-12" />
+                        <div class="column col-8 col-sm-12">
+                           <label class="form-checkbox form-inline">
+                              <input v-model="connection.untrustedConnection" type="checkbox"><i class="form-icon" /> {{ $t('message.untrustedConnection') }}
+                           </label>
+                        </div>
+                     </div>
                   </fieldset>
                </form>
             </div>
@@ -420,6 +428,7 @@ export default {
             key: '',
             ca: '',
             ciphers: '',
+            untrustedConnection: false,
             ssh: false,
             sshHost: '',
             sshUser: '',
diff --git a/src/renderer/components/WorkspaceEditConnectionPanel.vue b/src/renderer/components/WorkspaceEditConnectionPanel.vue
index 27c920da..de8eb97c 100644
--- a/src/renderer/components/WorkspaceEditConnectionPanel.vue
+++ b/src/renderer/components/WorkspaceEditConnectionPanel.vue
@@ -253,6 +253,14 @@
                            >
                         </div>
                      </div>
+                     <div class="form-group columns">
+                        <div class="column col-4 col-sm-12" />
+                        <div class="column col-8 col-sm-12">
+                           <label class="form-checkbox form-inline">
+                              <input v-model="localConnection.untrustedConnection" type="checkbox"><i class="form-icon" /> {{ $t('message.untrustedConnection') }}
+                           </label>
+                        </div>
+                     </div>
                   </fieldset>
                </form>
             </div>
diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js
index eb29fda4..a9b2f4e7 100644
--- a/src/renderer/i18n/en-US.js
+++ b/src/renderer/i18n/en-US.js
@@ -287,7 +287,8 @@ module.exports = {
       ourputFormat: 'Output format',
       singleFile: 'Single {ext} file',
       zipCompressedFile: 'ZIP compressed {ext} file',
-      disableBlur: 'Disable blur'
+      disableBlur: 'Disable blur',
+      untrustedConnection: 'Untrusted connection'
    },
    faker: {
       address: 'Address',