diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 8c2a5d1209..5794b93c4f 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -85,7 +85,6 @@ import {
   hiveTablePropertiesIndicateTransactional,
   isHiddenGridColumn,
   isTdengineExistingRowReadonlyColumn,
-  usesKeylessRowPredicate,
   usesSyntheticRowIdKey,
 } from "@/lib/tableEditing";
 import { formatGridSqlLiteral } from "@/lib/dataGridSql";
@@ -1260,14 +1259,6 @@ const canEditExistingRows = computed(
     !!props.customSave ||
     canEditExistingTableRows(props.databaseType, hiveTableTransactional.value, props.tableMeta?.primaryKeys ?? []),
 );
-const showKeylessEditWarning = computed(
-  () =>
-    props.context === "table-data" &&
-    !!props.editable &&
-    !!props.tableMeta &&
-    props.tableMeta.primaryKeys.length === 0 &&
-    usesKeylessRowPredicate(props.databaseType),
-);
 watch(
   () => [props.databaseType, props.connectionId, props.database, props.tableMeta?.schema, props.tableMeta?.tableName],
   async () => {
@@ -3210,19 +3201,6 @@ defineExpose({
                   {{ queryEditabilityHint }}
                 </TooltipContent>
               </Tooltip>
-              <Tooltip v-if="showKeylessEditWarning">
-                <TooltipTrigger as-child>
-                  <div
-                    class="flex h-5 items-center gap-1 rounded border border-amber-500/30 bg-amber-500/10 px-1.5 text-xs font-medium text-amber-700 dark:text-amber-300"
-                  >
-                    <TriangleAlert class="h-3 w-3" />
-                    {{ t("grid.keylessEditWarning") }}
-                  </div>
-                </TooltipTrigger>
-                <TooltipContent side="bottom" class="max-w-sm">
-                  {{ t("grid.keylessEditWarningHint") }}
-                </TooltipContent>
-              </Tooltip>
               <Button
                 variant="ghost"
                 size="sm"