diff --git a/Makefile b/Makefile
index 0b490561..58792ace 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,10 @@ ENABLE_NBGL_QRCODE = 1
 #DISABLE_STANDARD_SNPRINTF = 1
 #DISABLE_STANDARD_USB = 1
 #DISABLE_STANDARD_WEBUSB = 1
-#DISABLE_STANDARD_BAGL_UX_FLOW = 1
+
+ifeq ($(TARGET_NAME), TARGET_NANOS)
+    DISABLE_STANDARD_BAGL_UX_FLOW = 1
+endif
 
 ########################################
 #       Additional configuration       #
@@ -150,8 +153,6 @@ ENABLE_NBGL_QRCODE = 1
 DEFINES += HAVE_U2F HAVE_IO_U2F U2F_PROXY_MAGIC=\"ADA\"
 SDK_SOURCE_PATH  += lib_u2f
 
-DEFINES += HAVE_UX_LEGACY
-
 # Protect against stack overflows
 DEFINES += HAVE_BOLOS_APP_STACK_CANARY