diff --git a/src/app/ui/skin/font_data.cpp b/src/app/ui/skin/font_data.cpp
index 67bb79f24..5a0375832 100644
--- a/src/app/ui/skin/font_data.cpp
+++ b/src/app/ui/skin/font_data.cpp
@@ -27,19 +27,26 @@ FontData::FontData(she::FontType type)
 FontData::~FontData()
 {
   // Destroy all fonts
-  for (auto& it : m_fonts)
-    if (it.second)
-      it.second->dispose();
+  for (auto& it : m_fonts) {
+    she::Font* font = it.second;
+    if (font) {
+      if (font->fallback())
+        font->fallback()->dispose();
+      font->dispose();
+    }
+  }
 }
 
-she::Font* FontData::getFont(int size)
+she::Font* FontData::getFont(int size, bool useCache)
 {
   if (m_type == she::FontType::kSpriteSheet)
     size = 0;                   // Same size always
 
-  auto it = m_fonts.find(size);
-  if (it != m_fonts.end())
-    return it->second;
+  if (useCache) {
+    auto it = m_fonts.find(size);
+    if (it != m_fonts.end())
+      return it->second;
+  }
 
   she::Font* font = nullptr;
 
@@ -55,14 +62,20 @@ she::Font* FontData::getFont(int size)
   }
 
   if (m_fallback) {
-    she::Font* fallback = m_fallback->getFont(m_fallbackSize);
+    she::Font* fallback = m_fallback->getFont(
+      m_fallbackSize,
+      false); // Do not use cache
+
     if (font)
       font->setFallback(fallback);
     else
       font = fallback;
   }
-  
-  return m_fonts[size] = font;
+
+  if (useCache)
+    m_fonts[size] = font;
+
+  return font;
 }
 
 } // namespace skin
diff --git a/src/app/ui/skin/font_data.h b/src/app/ui/skin/font_data.h
index cadde5ff5..fb26239c7 100644
--- a/src/app/ui/skin/font_data.h
+++ b/src/app/ui/skin/font_data.h
@@ -28,7 +28,7 @@ namespace skin {
       m_fallbackSize = fallbackSize;
     }
 
-    she::Font* getFont(int size);
+    she::Font* getFont(int size, bool useCache = true);
 
   private:
     she::FontType m_type;
diff --git a/src/ft/hb_face.h b/src/ft/hb_face.h
index 2837f115e..dc8c9ad07 100644
--- a/src/ft/hb_face.h
+++ b/src/ft/hb_face.h
@@ -21,7 +21,7 @@ namespace ft {
   public:
     HBFace(FT_Face face) : FaceFT(face) {
       m_font = (face ? hb_ft_font_create((FT_Face)face, nullptr): nullptr);
-      m_buffer = hb_buffer_create();
+      m_buffer = (face ? hb_buffer_create(): nullptr);
     }
 
     ~HBFace() {