diff --git a/app/src/actions/ConnectionManager.ts b/app/src/actions/ConnectionManager.ts
index fce8cbed..7fb423ae 100644
--- a/app/src/actions/ConnectionManager.ts
+++ b/app/src/actions/ConnectionManager.ts
@@ -50,7 +50,19 @@ export const loadConnectionSettings = () => async (dispatch: Dispatch<any>, getS
   }
 }
 
-export type CertificateTypes = 'selfSignedCertificate' | 'clientCertificate' | 'clientKey'
+// A Pre-shared-key is a symmetric encryption key, such as an AES-128 key, that is shared
+// ahead of time (out of band) between the client and server. It might be programmed into
+// the firmware at the factory for an IoT device.
+//
+// The server optionally sends a `psk_hint`, and the client sends a `pskIdentity` (also
+// sometimes called an hint) that functions as a username. The server uses the `pskIdentity`
+// to figure out which shared key to use, and they both encrypt using that key.
+//
+// For more information on the `psk` and `pskIdentity` options:
+// See https://mosquitto.org/man/mosquitto-conf-5.html#idm854 "Pre-shared-key based SSL/TLS Support", and also
+// mosquitto's `psk_file` option.
+
+export type CertificateTypes = 'selfSignedCertificate' | 'clientCertificate' | 'clientKey' | 'psk'
 export const selectCertificate =
   (type: CertificateTypes, connectionId: string) => async (dispatch: Dispatch<any>, getState: () => AppState) => {
     try {
diff --git a/app/src/components/ConnectionSetup/Certificates.tsx b/app/src/components/ConnectionSetup/Certificates.tsx
index 0277c1a2..a1421739 100644
--- a/app/src/components/ConnectionSetup/Certificates.tsx
+++ b/app/src/components/ConnectionSetup/Certificates.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import CertificateFileSelection from './CertificateFileSelection'
 import Undo from '@material-ui/icons/Undo'
 import { bindActionCreators } from 'redux'
-import { Button, Grid } from '@material-ui/core'
+import { Button, Grid, TextField } from '@material-ui/core'
 import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions } from '../../model/ConnectionOptions'
@@ -68,6 +68,16 @@ class Certificates extends React.PureComponent<Props, State> {
                 certificateType="clientKey"
               />
             </Grid>
+            <Grid item={true} xs={12} className={classes.gridPadding}>
+              <TextField
+                className={`${classes.fullWidth} advanced-connection-settings-topic-input`}
+                label="Pre Shared Key (PSK)"
+                placeholder="0123456789ABCDEF0123456789ABCDEF"
+                margin="normal"
+                value={this.props.connection.psk}
+                onChange={this.handleChange('psk')}
+              />
+            </Grid>
             <Grid item={true} xs={2} className={classes.gridPadding}>
               <br />
               <Button
diff --git a/app/src/model/ConnectionOptions.ts b/app/src/model/ConnectionOptions.ts
index 8eb98719..a5fcf997 100644
--- a/app/src/model/ConnectionOptions.ts
+++ b/app/src/model/ConnectionOptions.ts
@@ -26,6 +26,7 @@ export interface ConnectionOptions {
   clientCertificate?: CertificateParameters
   clientKey?: CertificateParameters
   clientId?: string
+  psk?: string
   subscriptions: Array<Subscription>
 }
 
@@ -45,6 +46,7 @@ export function toMqttConnection(options: ConnectionOptions): MqttOptions | unde
     certificateAuthority: options.selfSignedCertificate ? options.selfSignedCertificate.data : undefined,
     clientCertificate: options.clientCertificate ? options.clientCertificate.data : undefined,
     clientKey: options.clientKey ? options.clientKey.data : undefined,
+    psk: options.psk ? options.psk : undefined,
   }
 }
 
diff --git a/backend/src/DataSource/MqttSource.ts b/backend/src/DataSource/MqttSource.ts
index e53d5a25..4ca6cf84 100644
--- a/backend/src/DataSource/MqttSource.ts
+++ b/backend/src/DataSource/MqttSource.ts
@@ -16,6 +16,7 @@ export interface MqttOptions {
   certificateAuthority?: string
   clientCertificate?: string
   clientKey?: string
+  psk?: string
 }
 
 export interface Subscription {
@@ -47,6 +48,18 @@ export class MqttSource implements DataSource<MqttOptions> {
       throw error
     }
 
+    // See psk under https://nodejs.org/api/tls.html#tls_tls_connect_options_callback
+    const pskOptions = {
+      pskCallback: () => {
+        if (options.psk) {
+          return {
+            psk: Buffer.from(options.psk, 'hex'),
+            identity: options.username,
+          }
+        }
+      },
+    }
+
     const client = mqttConnect(url.toString(), {
       resubscribe: false,
       rejectUnauthorized: options.certValidation,
@@ -57,12 +70,13 @@ export class MqttSource implements DataSource<MqttOptions> {
       ca: options.certificateAuthority ? Buffer.from(options.certificateAuthority, 'base64') : undefined,
       cert: options.clientCertificate ? Buffer.from(options.clientCertificate, 'base64') : undefined,
       key: options.clientKey ? Buffer.from(options.clientKey, 'base64') : undefined,
+      ...(options.psk ? pskOptions : {}),
     } as any)
 
     this.client = client
 
     client.on('error', (error: Error) => {
-      console.log(error)
+      console.log('client error', error)
       this.stateMachine.setError(error)
     })