diff --git a/.travis.yml b/.travis.yml
index 936289d5..5a6d1410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,9 @@ after_success:
   - if [ $DOCKER_HUB_USERNAME ]; then 
       docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD;
       docker build -t $DOCKER_IMAGE_NAME .;
-      if [ "$TRAVIS_TAG" != "master" ]; then
+      if [ "$TRAVIS_TAG" != "master" && -z "$TRAVIS_TAG"]; then
         docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$TRAVIS_TAG;
       fi;
 
       docker push $DOCKER_IMAGE_NAME;
-    fi;
\ No newline at end of file
+    fi;