diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index edb168816f31..ca4978727e5d 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -1543,7 +1543,8 @@ private function getQueryResponseForResultsReturned(
         $editable = ($has_unique
             || $GLOBALS['cfg']['RowActionLinksWithoutUnique']
             || $updatableView)
-            && $just_one_table;
+            && $just_one_table
+            && ! Utilities::isSystemSchema($db);
 
         $_SESSION['tmpval']['possible_as_geometry'] = $editable;
 
@@ -1557,7 +1558,7 @@ private function getQueryResponseForResultsReturned(
             'pview_lnk' => '1',
         ];
 
-        if (Utilities::isSystemSchema($db) || ! $editable) {
+        if (! $editable) {
             $displayParts = [
                 'edit_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
                 'del_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,