diff --git a/app/src/components/ChooseRoom.js b/app/src/components/ChooseRoom.js
index b81ff47..3d549b3 100644
--- a/app/src/components/ChooseRoom.js
+++ b/app/src/components/ChooseRoom.js
@@ -86,7 +86,7 @@ const DialogTitle = withStyles(styles)((props) =>
 
 	return (
 		<MuiDialogTitle disableTypography className={classes.dialogTitle} {...other}>
-			{ window.config && window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
+			{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
 			<Typography variant='h5'>{children}</Typography>
 		</MuiDialogTitle>
 	);
@@ -125,7 +125,7 @@ const ChooseRoom = ({
 				}}
 			>
 				<DialogTitle>
-					{ window.config && window.config.title ? window.config.title : 'Multiparty meeting' }
+					{ window.config.title ? window.config.title : 'Multiparty meeting' }
 					<hr />
 				</DialogTitle>
 				<DialogContent>
diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js
index 2cc380a..23cddec 100644
--- a/app/src/components/Controls/TopBar.js
+++ b/app/src/components/Controls/TopBar.js
@@ -194,14 +194,14 @@ const TopBar = (props) =>
 						<MenuIcon />
 					</IconButton>
 				</PulsingBadge>
-				{ window.config && window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
+				{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
 				<Typography
 					className={classes.title}
 					variant='h6'
 					color='inherit'
 					noWrap
 				>
-					{ window.config && window.config.title ? window.config.title : 'Multiparty meeting' }
+					{ window.config.title ? window.config.title : 'Multiparty meeting' }
 				</Typography>
 				<div className={classes.grow} />
 				<div className={classes.actionButtons}>
diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js
index 85262b1..6b1d7ad 100644
--- a/app/src/components/JoinDialog.js
+++ b/app/src/components/JoinDialog.js
@@ -128,9 +128,9 @@ const DialogTitle = withStyles(styles)((props) =>
 
 	return (
 		<MuiDialogTitle disableTypography className={classes.dialogTitle} {...other}>
-			{ window.config && window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
+			{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
 			<Typography variant='h5'>{children}</Typography>
-			{ window.config && window.config.loginEnabled &&
+			{ window.config.loginEnabled &&
 				<Tooltip
 					onClose={handleTooltipClose}
 					onOpen={handleTooltipOpen}
@@ -221,7 +221,7 @@ const JoinDialog = ({
 					}}
 					loggedIn={loggedIn}
 				>
-					{ window.config && window.config.title ? window.config.title : 'Multiparty meeting' }
+					{ window.config.title ? window.config.title : 'Multiparty meeting' }
 					<hr />
 				</DialogTitle>
 				<DialogContent>
diff --git a/app/src/components/Settings/Settings.js b/app/src/components/Settings/Settings.js
index af46eb2..064aa2f 100644
--- a/app/src/components/Settings/Settings.js
+++ b/app/src/components/Settings/Settings.js
@@ -233,8 +233,7 @@ const Settings = ({
 					</FormHelperText>
 				</FormControl>
 			</form>
-			{ 	
-				'audioOutputSupportedBrowsers' in window.config &&
+			{ 'audioOutputSupportedBrowsers' in window.config &&
 				window.config.audioOutputSupportedBrowsers.includes(me.browser.name) &&
 				<form className={classes.setting} autoComplete='off'>
 					<FormControl className={classes.formControl}>
@@ -355,7 +354,7 @@ const Settings = ({
 			/>
 			{ settings.advancedMode &&
 				<React.Fragment>
-					{ window.config && !window.config.lockLastN &&
+					{ !window.config.lockLastN &&
 						<form className={classes.setting} autoComplete='off'>
 							<FormControl className={classes.formControl}>
 								<Select