diff --git a/src/conky.c b/src/conky.c
index 6a4eae38..a3f21f5f 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -789,11 +789,6 @@ void generate_text_internal(char *p, int p_max_size,
 		switch (obj->type) {
 			default:
 				NORM_ERR("not implemented obj type %d", obj->type);
-#ifdef X11
-			OBJ(font) {
-				new_font(obj, p, p_max_size);
-			}
-#endif /* X11 */
 			OBJ(text) {
 				snprintf(p, p_max_size, "%s", obj->data.s);
 			}
diff --git a/src/core.c b/src/core.c
index dd47706e..493b2884 100644
--- a/src/core.c
+++ b/src/core.c
@@ -522,6 +522,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
 #ifdef X11
 	END OBJ(font, 0)
 		scan_font(obj, arg);
+		obj->callbacks.print = &new_font;
 		obj->callbacks.free = &gen_free_opaque;
 #endif /* X11 */
 	END OBJ(conky_version, 0)