diff --git a/src/ts/components/shared/settings-modal/settings-modal.pug b/src/ts/components/shared/settings-modal/settings-modal.pug
index 6633b88..853c495 100644
--- a/src/ts/components/shared/settings-modal/settings-modal.pug
+++ b/src/ts/components/shared/settings-modal/settings-modal.pug
@@ -73,14 +73,13 @@
 						| Only allow whispers from friends
 					.form-group
 				.form-group
-					label#chatlog-opacity-label Message timestamp
+					label#chatlog-opacity-label Timestamp
 					div
-						.btn-group.ml-2(btnCheckbox)
-								button.btn.btn-outline-secondary.d-none.d-sm-block([class.active]='off' (click)='switchTimestamp()') Off
-								button.btn.btn-outline-secondary.d-none.d-sm-block([class.active]='twelve' (click)='switchTimestamp("12")') 12
-								button.btn.btn-outline-secondary.d-none.d-sm-block([class.active]='twentyFour' (click)='switchTimestamp("24")') 24
-						span.ml-2 {{timestampText}}
-						//small.form-text.text-muted.mt-0 Shows message time
+						.btn-group.mb-2(btnCheckbox)
+								button.btn.btn-outline-secondary.d-sm-block([class.active]='off' (click)='switchTimestamp()') None
+								button.btn.btn-outline-secondary.d-sm-block([class.active]='twelve' (click)='switchTimestamp("12")') 12-hour format
+								button.btn.btn-outline-secondary.d-sm-block([class.active]='twentyFour' (click)='switchTimestamp("24")') 24-hour format
+						small.form-text.text-muted.mt-0 Displays a timestamp in front of chatlog messages
 
 				.form-group
 					label#chatlog-opacity-label Chatlog background opacity
diff --git a/src/ts/components/shared/settings-modal/settings-modal.ts b/src/ts/components/shared/settings-modal/settings-modal.ts
index 222e8ca..99e79a3 100644
--- a/src/ts/components/shared/settings-modal/settings-modal.ts
+++ b/src/ts/components/shared/settings-modal/settings-modal.ts
@@ -29,7 +29,6 @@ export class SettingsModal implements OnInit, OnDestroy {
 	off = false;
 	twelve = false;
 	twentyFour = false;
-	timestampText: 'Disabled' | '24 Hour mode' | '12 Hour mode' = 'Disabled';
 	@Output() close = new EventEmitter();
 	account: AccountSettings = {};
 	browser: BrowserSettings = {};
@@ -121,15 +120,12 @@ export class SettingsModal implements OnInit, OnDestroy {
 		switch (this.browser.timestamp) {
 			case '12':
 				this.twelve = true;
-				this.timestampText = '12 Hour mode';
 				break;
 			case '24':
 				this.twentyFour = true;
-				this.timestampText = '24 Hour mode';
 				break;
 			default:
 				this.off = true;
-				this.timestampText = 'Disabled';
 				break;
 		}
 	}