diff --git a/lib/jsdoc/tag/validator.js b/lib/jsdoc/tag/validator.js
index 2a2d511d..8af81860 100644
--- a/lib/jsdoc/tag/validator.js
+++ b/lib/jsdoc/tag/validator.js
@@ -28,14 +28,10 @@ exports.validate = function(tag, tagDef, meta) {
     if (!tagDef && !env.conf.tags.allowUnknownTags) {
         logger.error( buildMessage(tag.title, meta, 'is not a known tag') );
     }
-    else if (!tag.text) {
-        if (tagDef.mustHaveValue) {
-            logger.error( buildMessage(tag.title, meta, 'requires a value') );
-        }
+    else if (!tag.text && tagDef.mustHaveValue) {
+        logger.error( buildMessage(tag.title, meta, 'requires a value') );
     }
-    else {
-        if (tagDef.mustNotHaveValue) {
-            logger.error( buildMessage(tag.title, meta, 'does not permit a value') );
-        }
+    else if (tag.text && tagDef.mustNotHaveValue) {
+        logger.error( buildMessage(tag.title, meta, 'does not permit a value') );
     }
 };