diff --git a/ChangeLog b/ChangeLog
index 7cc95f2932..dc4665a5c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 - issue #14390 Can't unhide tables
 - issue #14382 "Visualize GIS data" icon missing
 - issue #14435 Event scheduler status toggle doesn't work
+- issue #14365, View not working on multiple servers
 
 4.8.2 (2018-06-21)
 - issue #14370 WHERE 0 causes Fatal error
diff --git a/view_create.php b/view_create.php
index 184d3f0d02..0a25ced57c 100644
--- a/view_create.php
+++ b/view_create.php
@@ -40,10 +40,6 @@ $view_security_options = array(
     'INVOKER'
 );
 
-if (empty($sql_query)) {
-    $sql_query = '';
-}
-
 // View name is a compulsory field
 if (isset($_REQUEST['view']['name'])
     && empty($_REQUEST['view']['name'])
@@ -175,6 +171,8 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     exit;
 }
 
+$sql_query = ! empty($_GET['sql_query']) ? $_GET['sql_query'] : '';
+
 // prefill values if not already filled from former submission
 $view = array(
     'operation' => 'create',