diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c
index 90277d6e7..65d21936e 100644
--- a/amiga/font_bitmap.c
+++ b/amiga/font_bitmap.c
@@ -210,8 +210,6 @@ bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle,
 		*char_offset = length;
 	}
 
-	ami_font_bm_close(bmfont);
-
 	return true;
 }
 
@@ -227,6 +225,8 @@ ULONG ami_font_bm_text(struct RastPort *rp, const char *string, ULONG length,
 		free(localtext);
 	}
 
+	ami_font_bm_close(bmfont);
+
 	return 0;
 }