diff --git a/src/Axis.vala b/src/Axis.vala
index b5d7768..9a7914d 100644
--- a/src/Axis.vala
+++ b/src/Axis.vala
@@ -209,7 +209,8 @@ namespace CairoChart {
 			date = dt.format(date_format);
 			var dsec_str =
 				("%."+(dsec_signs.to_string())+"Lf").printf((LongDouble)(x - (int64)x)).offset(1);
-			time = dt.format(time_format) + dsec_str;
+			if (time_format != "")
+				time = dt.format(time_format) + dsec_str;
 		}
 
 		/**
@@ -526,9 +527,7 @@ namespace CairoChart {
 						switch (dtype) {
 						case Axis.DType.NUMBERS: text_t.show(); break;
 						case Axis.DType.DATE_TIME:
-							if (date_format != "") text_t.show();
-							chart.ctx.move_to (crpt, print_y - dtf);
-							if (time_format != "") time_text_t.show();
+							text_t.show(); chart.ctx.move_to (crpt, print_y - dtf); time_text_t.show();
 							break;
 						}
 						// 6. Draw grid lines to the ser.axis_y.place.zmin.
@@ -556,9 +555,7 @@ namespace CairoChart {
 						switch (dtype) {
 						case Axis.DType.NUMBERS: text_t.show(); break;
 						case Axis.DType.DATE_TIME:
-							if (date_format != "") text_t.show();
-							chart.ctx.move_to (crpt, print_y - dtf);
-							if (time_format != "") time_text_t.show();
+							text_t.show(); chart.ctx.move_to (crpt, print_y - dtf); time_text_t.show();
 							break;
 						}
 						// 6. Draw grid lines to the ser.axis_y.place.zmax.
diff --git a/src/Text.vala b/src/Text.vala
index c146df9..7fe6385 100644
--- a/src/Text.vala
+++ b/src/Text.vala
@@ -94,6 +94,7 @@ namespace CairoChart {
 		 * Show ``Text``.
 		 */
 		public virtual void show () {
+			if (text == "") return;
 			chart.ctx.select_font_face(font.family,
 			                           font.slant,
 			                           font.weight);