diff --git a/Makefile.libnx b/Makefile.libnx
index e6f1875b86..198e2b90b7 100644
--- a/Makefile.libnx
+++ b/Makefile.libnx
@@ -40,7 +40,7 @@ HAVE_NETWORKING = 1
 # RetroArch libnx useful flags
 HAVE_THREADS = 1
 HAVE_PTHREADS = 1
-HAVE_FREETYPE = 1
+HAVE_FREETYPE = 0
 HAVE_SWITCH = 1
 HAVE_LIBNX = 1
 HAVE_OPENGL = 1
@@ -110,9 +110,9 @@ APP_ICON := pkg/libnx/retroarch.jpg
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd
 
 CFLAGS := -g -Wall -O3 -ffast-math -ffunction-sections \
-          $(ARCH) $(DEFINES) -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h $(shell $(PORTLIBS)/bin/freetype-config --cflags)
+          $(ARCH) $(DEFINES) -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)
 
-CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DHAVE_FREETYPE
+CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS #-DHAVE_FREETYPE
 
 ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
   CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
@@ -127,7 +127,7 @@ CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs $(ARCH) -Wl,--allow-multiple-definition -Wl,-Map,$(notdir $*.map)
 
-LIBS	:= -lfreetype -lstdc++ -lbz2 -lpng -lz -lnx -lm
+LIBS	:= -lstdc++ -lbz2 -lpng -lz -lnx -lm
 
 ifeq ($(HAVE_OPENGL), 1)
   LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)
diff --git a/gfx/font_driver.c b/gfx/font_driver.c
index 1f7edce0aa..9081c721bb 100644
--- a/gfx/font_driver.c
+++ b/gfx/font_driver.c
@@ -56,14 +56,6 @@ int font_renderer_create_default(
    for (i = 0; font_backends[i]; i++)
    {
       const char *path = font_path;
-      /*
-        Switch libnx freetype is bugged on thread, skip
-        TODO: remove when fixed
-      */
-#if defined(HAVE_LIBNX) && defined(HAVE_FREETYPE)
-      if(font_backends[i] == &freetype_font_renderer && *video_driver_get_threaded()) // freetype
-         continue;
-#endif
 
       if (!path)
          path = font_backends[i]->get_default_font();