diff --git a/board/fizz/board.h b/board/fizz/board.h
index dbfd7b2f04..5c9059257b 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -12,7 +12,8 @@
  * Allow dangerous commands.
  * TODO: Remove this config before production.
  */
-#define CONFIG_SYSTEM_UNLOCKED
+#undef  CONFIG_SYSTEM_UNLOCKED
+#define CONFIG_USB_PD_COMM_LOCKED
 
 /* EC */
 #define CONFIG_ADC