diff --git a/git/refs/tag.py b/git/refs/tag.py
index 0295b54d2..d32d91bcf 100644
--- a/git/refs/tag.py
+++ b/git/refs/tag.py
@@ -113,10 +113,12 @@ def create(
         if "ref" in kwargs and kwargs["ref"]:
             reference = kwargs["ref"]
 
+        if "message" in kwargs and kwargs["message"]:
+            kwargs["m"] = kwargs["message"]
+            del kwargs["message"]
+
         if logmsg:
             kwargs["m"] = logmsg
-        elif "message" in kwargs and kwargs["message"]:
-            kwargs["m"] = kwargs["message"]
 
         if force:
             kwargs["f"] = True
diff --git a/test/test_refs.py b/test/test_refs.py
index 605648b04..5bb83100e 100644
--- a/test/test_refs.py
+++ b/test/test_refs.py
@@ -572,6 +572,23 @@ def test_head_reset(self, rw_repo):
 
         # END for each path
 
+    @with_rw_repo("0.1.6")
+    def test_tag_message(self, rw_repo):
+        tag_ref = TagReference.create(rw_repo, "test-message-1", message="test")
+        assert tag_ref.tag.message == "test"
+
+        tag_ref = TagReference.create(rw_repo, "test-message-2", logmsg="test")
+        assert tag_ref.tag.message == "test"
+
+        tag_ref = TagReference.create(
+            rw_repo,
+            "test-message-3",
+            # Logmsg should take precedence over "message".
+            message="test1",
+            logmsg="test2",
+        )
+        assert tag_ref.tag.message == "test2"
+
     def test_dereference_recursive(self):
         # for now, just test the HEAD
         assert SymbolicReference.dereference_recursive(self.rorepo, "HEAD")