diff --git a/.travis.yml b/.travis.yml
index 552534b66..e514fc37a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,11 +22,11 @@ deploy:
     api_key: $NPM_TOKEN
     on:
       tags: true
-      branch: master
+      condition: $(git branch --contains $TRAVIS_TAG | grep -l '^[\* ] master$')
   - provider: pages
     skip_cleanup: true
     github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
     keep_history: true
     on:
       tags: true
-      branch: master
+      condition: $(git branch --contains $TRAVIS_TAG | grep -l '^[\* ] master$')