diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index ef4807bfe8..364a838548 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -1,5 +1,6 @@
 0.0.6 (in development)
 ------------------------------------------------------------------------
+- Fix: [#4929] Changing TTF language crashes game.
 
 0.0.5 (2016-12-27)
 ------------------------------------------------------------------------
diff --git a/src/drawing/font.c b/src/drawing/font.c
index 59321b9ddb..8c96fb9604 100644
--- a/src/drawing/font.c
+++ b/src/drawing/font.c
@@ -192,6 +192,9 @@ bool font_supports_string_ttf(const utf8 *text, int fontSize)
 {
 	const utf8 *src = text;
 	const TTF_Font *font = gCurrentTTFFontSet->size[fontSize].font;
+	if (font == NULL) {
+		return false;
+	}
 
 	uint32 codepoint;
 	while ((codepoint = utf8_get_next(src, &src)) != 0) {
diff --git a/src/interface/Fonts.cpp b/src/interface/Fonts.cpp
index 040e7306a3..67df2256ae 100644
--- a/src/interface/Fonts.cpp
+++ b/src/interface/Fonts.cpp
@@ -101,6 +101,7 @@ static bool LoadFont(TTFFontSetDescriptor * font)
     gUseTrueTypeFont   = true;
     gCurrentTTFFontSet = font;
 
+    ttf_dispose();
     bool fontInitialised = ttf_initialise();
     return fontInitialised;
 }