diff --git a/ChangeLog b/ChangeLog
index 5eecc92b97..946bb3d5c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
 - bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click
 - bug #3961 Avoid Suhosin warning when in simulation mode
 - bug #3897 Row Statistics and Space usage bugs
+- bug #3966 Only display "table has no unique column" message when applicable
 
 4.0.3.0 (not yet released)
 - bug #3941 Recent tables list always empty
diff --git a/sql.php b/sql.php
index 63528bdf77..925442874a 100644
--- a/sql.php
+++ b/sql.php
@@ -1094,7 +1094,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
         && trim($analyzed_sql[0]['select_expr_clause']) == '*'
         && PMA_Table::isUpdatableView($db, $table);
     $editable = $has_unique || $updatableView;
-    if ($GLOBALS['dbi']->isSystemSchema($db) || ! $editable) {
+    if (!empty($table) && ($GLOBALS['dbi']->isSystemSchema($db) || !$editable)) {
         $disp_mode = 'nnnn110111';
         $msg = PMA_message::notice(
             __(