diff --git a/lisp/org.el b/lisp/org.el
index e39b60b92..06c9cf4ca 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13407,7 +13407,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
 		     current-tags inherited-tags table
 		     (if org-fast-tag-selection-include-todo
 			 org-todo-key-alist))
-		  (let ((org-add-colon-after-tag-completion t))
+		  (let ((org-add-colon-after-tag-completion (< 1 (length table))))
 		    (org-trim
 		     (org-icompleting-read "Tags: "
 					   'org-tags-completion-function