diff --git a/sys/src/libdraw/buildfont.c b/sys/src/libdraw/buildfont.c
index ca13d55d6..9ff485347 100644
--- a/sys/src/libdraw/buildfont.c
+++ b/sys/src/libdraw/buildfont.c
@@ -129,8 +129,9 @@ freefont(Font *f)
 	}
 	for(i=0; i<f->nsubf; i++){
 		s = f->subf[i].f;
-		if(s && s!=display->defaultsubfont)
-			freesubfont(s);
+		if(s)
+			if(display == nil || s!=display->defaultsubfont)
+				freesubfont(s);
 	}
 	freeimage(f->cacheimage);
 	free(f->name);