diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/c0959ad462b2_add_tool_id_and_tool_version_to_tool_.py b/lib/galaxy/model/migrations/alembic/versions_gxy/c0959ad462b2_add_tool_id_and_tool_version_to_tool_.py
index c16cb65a2e7b..e1eb75a1b436 100644
--- a/lib/galaxy/model/migrations/alembic/versions_gxy/c0959ad462b2_add_tool_id_and_tool_version_to_tool_.py
+++ b/lib/galaxy/model/migrations/alembic/versions_gxy/c0959ad462b2_add_tool_id_and_tool_version_to_tool_.py
@@ -13,6 +13,7 @@
 
 from galaxy.model.migrations.util import (
     add_column,
+    column_exists,
     drop_column,
     transaction,
 )
@@ -31,8 +32,10 @@
 
 def upgrade():
     with transaction():
-        add_column(table_name, Column(tool_id_column, String(255), nullable=False))
-        add_column(table_name, Column(tool_version_column, String(255), nullable=True))
+        if not column_exists(table_name, tool_id_column, False):
+            add_column(table_name, Column(tool_id_column, String(255), nullable=False))
+        if not column_exists(table_name, tool_version_column, False):
+            add_column(table_name, Column(tool_version_column, String(255), nullable=True))
 
 
 def downgrade():