diff --git a/meteor/client/ui/Settings/DeviceSettings.tsx b/meteor/client/ui/Settings/DeviceSettings.tsx
index 3dce2d5b15..c9341397a1 100644
--- a/meteor/client/ui/Settings/DeviceSettings.tsx
+++ b/meteor/client/ui/Settings/DeviceSettings.tsx
@@ -69,7 +69,9 @@ export default translateWithTracker<IDeviceSettingsProps, IDeviceSettingsState,
 			return null
 		}
 
-		restartDevice(device: PeripheralDevice) {
+		restartDevice(device: PeripheralDevice, e: React.UIEvent<HTMLElement>) {
+			e.persist()
+
 			const { t } = this.props
 			doModalDialog({
 				message: t('Are you sure you want to restart this device?'),
@@ -148,7 +150,7 @@ export default translateWithTracker<IDeviceSettingsProps, IDeviceSettingsState,
 							<h2 className="mhn mtn">{t('Generic Properties')}</h2>
 							<label className="field">
 								<LabelActual label={t('Device Name')} />
-								{!(this.props.device && this.props.device.name) ? (
+								{!(device && device.name) ? (
 									<div className="error-notice inline">
 										{t('No name set')} <FontAwesomeIcon icon={faExclamationTriangle} />
 									</div>
@@ -157,7 +159,7 @@ export default translateWithTracker<IDeviceSettingsProps, IDeviceSettingsState,
 									<EditAttribute
 										modifiedClassName="bghl"
 										attribute="name"
-										obj={this.props.device}
+										obj={device}
 										type="text"
 										collection={PeripheralDevices}
 										className="mdinput"
@@ -168,7 +170,10 @@ export default translateWithTracker<IDeviceSettingsProps, IDeviceSettingsState,
 						</div>
 						<div className="col c12 rl-c6 alright">
 							<div className="mbs">
-								<button className="btn btn-secondary btn-tight" onClick={() => device && this.restartDevice(device)}>
+								<button
+									className="btn btn-secondary btn-tight"
+									onClick={(e) => device && this.restartDevice(device, e)}
+								>
 									{t('Restart Device')}
 								</button>
 							</div>
@@ -213,7 +218,7 @@ export default translateWithTracker<IDeviceSettingsProps, IDeviceSettingsState,
 							<EditAttribute
 								modifiedClassName="bghl"
 								attribute="disableVersionChecks"
-								obj={this.props.device}
+								obj={device}
 								type="checkbox"
 								collection={PeripheralDevices}
 								className="input"
@@ -225,9 +230,9 @@ export default translateWithTracker<IDeviceSettingsProps, IDeviceSettingsState,
 						{this.renderSpecifics()}
 					</div>
 
-					{this.props.device &&
-					this.props.device.type === PeripheralDeviceType.PACKAGE_MANAGER &&
-					this.props.device.subType === PERIPHERAL_SUBTYPE_PROCESS
+					{device &&
+					device.type === PeripheralDeviceType.PACKAGE_MANAGER &&
+					device.subType === PERIPHERAL_SUBTYPE_PROCESS
 						? this.renderPackageManagerSpecial()
 						: null}
 				</div>
diff --git a/meteor/client/ui/Status/SystemStatus.tsx b/meteor/client/ui/Status/SystemStatus.tsx
index 15db592a3e..250f60ed52 100644
--- a/meteor/client/ui/Status/SystemStatus.tsx
+++ b/meteor/client/ui/Status/SystemStatus.tsx
@@ -313,6 +313,7 @@ export const DeviceItem = reacti18next.withTranslation()(
 										onClick={(e) => {
 											e.preventDefault()
 											e.stopPropagation()
+											e.persist()
 
 											doModalDialog({
 												message: t('Are you sure you want to restart this device?'),
diff --git a/meteor/lib/clientUserAction.ts b/meteor/lib/clientUserAction.ts
index 290238cc2e..5d184f6bb9 100644
--- a/meteor/lib/clientUserAction.ts
+++ b/meteor/lib/clientUserAction.ts
@@ -263,7 +263,10 @@ export function eventContextForLog(e: any): [string, Time] {
 		str = e.type
 	}
 	if (!str) {
-		logger.error('Unknown event', e)
+		logger.error(
+			'Could not create context in eventContextForLog, because provided event had no identifiable type',
+			e
+		)
 		str = 'N/A'
 	}