diff --git a/src/,,config_mega65.s b/src/,,config_mega65.s
index c86a9e1b..40166e4e 100644
--- a/src/,,config_mega65.s
+++ b/src/,,config_mega65.s
@@ -112,8 +112,3 @@
 ; --- Other
 
 ;; #CONFIG# COMPRESSION_LVL_2          NO
-
-
-; --- Temporary hotfixes
-
-;; #CONFIG# HOTFIX_CHARPTR             YES       ; workaround for https://github.com/MEGA65/mega65-core/issues/308
diff --git a/src/kernal/board_m65/mega65_viciv_shutdown.s b/src/kernal/board_m65/mega65_viciv_shutdown.s
index 38cc0067..f5769257 100644
--- a/src/kernal/board_m65/mega65_viciv_shutdown.s
+++ b/src/kernal/board_m65/mega65_viciv_shutdown.s
@@ -17,9 +17,16 @@ viciv_shutdown:
 	lda #$03
 	sta MISC_EMU
 
-	; Set misc VIC-IV flags
+	; Restore chargen location
+	
+	lda #$10
+	sta VIC_CHARPTR+1
+	lda #$00
+	sta VIC_CHARPTR+0
+	sta VIC_CHARPTR+2
 
-	lda #%00000000
+	; Set misc VIC-IV flags
+                                       ; .A is %00000000 here
 	sta VIC_CTRLB                      ; disable extended resolution and attributes, disable 3.5 MHz mode
 	jsr mega65_viciv_setctrl_AC        ; enable C64 character set, initialize remaining CTRLA / CTRLC bits
 
diff --git a/src/kernal/keyboard/scnkey_set_keytab.s b/src/kernal/keyboard/scnkey_set_keytab.s
index cef83aac..e4990d65 100644
--- a/src/kernal/keyboard/scnkey_set_keytab.s
+++ b/src/kernal/keyboard/scnkey_set_keytab.s
@@ -80,10 +80,8 @@ scnkey_toggle_if_needed: ; entry for SCNKEY (TWW/CTR version)
 
 !ifdef CONFIG_MB_M65 {
 
-!ifndef HOTFIX_CHARPTR {
 	jsr M65_MODEGET
 	bcc @2
-}
 
 	; Toggling charsets for C64 mode
 
@@ -93,15 +91,12 @@ scnkey_toggle_if_needed: ; entry for SCNKEY (TWW/CTR version)
 @1:
 	rts
 
-!ifndef HOTFIX_CHARPTR {
-
 	; Toggling charsets for M65 mode
 @2:
 	lda VIC_CHARPTR+1
 	eor #%00001000
 	sta VIC_CHARPTR+1
 	rts
-}
 
 } else {
 
diff --git a/src/kernal/screen_m65/mega65_scrmodeset.s b/src/kernal/screen_m65/mega65_scrmodeset.s
index 56b2d3b4..b060e736 100644
--- a/src/kernal/screen_m65/mega65_scrmodeset.s
+++ b/src/kernal/screen_m65/mega65_scrmodeset.s
@@ -91,8 +91,6 @@ m65_scrmodeset_internal: ; entry point for M65_MODE65
 	stx VIC_COLPTR+0
 	stx VIC_COLPTR+1
 
-!ifndef CONFIG_HOTFIX_CHARPTR {
-
 	; Set the following location:
 	; - VIC_CHARPTR                   - for character generator location
 	
@@ -102,7 +100,6 @@ m65_scrmodeset_internal: ; entry point for M65_MODE65
 	sta VIC_CHARPTR+1
 	lda #$01
 	sta VIC_CHARPTR+2
-}
 
 	; Set the following locations:
 	; - M65_SCRGUARD, M65_COLGUARD    - guards for virtual screen end