diff --git a/ChangeLog b/ChangeLog
index 802816e12..502d0c3df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 	special case wdays=0.
 	(org-agenda-get-deadlines): Pass wdays to
 	`org-agenda-deadline-face'.
+	(org-agenda-align-tags): Bug fix.
 
 2008-02-28  Bastien Guerry  <bzg@altern.org>
 
diff --git a/org.el b/org.el
index 9e681f9ea..0913c5234 100644
--- a/org.el
+++ b/org.el
@@ -23059,8 +23059,8 @@ the new TODO state."
 				(if line (point-at-eol) nil) t)
 	(add-text-properties
 	 (match-beginning 2) (match-end 2)
-	 (list 'face (list 'org-tag (get-text-property
-				     (match-beginning 2) 'face))))
+	 (list 'face (delq nil (list 'org-tag (get-text-property
+					       (match-beginning 2) 'face)))))
 	(setq l (- (match-end 2) (match-beginning 2))
 	      c (if (< org-agenda-tags-column 0)
 		    (- (abs org-agenda-tags-column) l)