diff --git a/web/pgadmin/browser/templates/browser/js/messages.js b/web/pgadmin/browser/templates/browser/js/messages.js
index 2af0752..6983b20 100644
--- a/web/pgadmin/browser/templates/browser/js/messages.js
+++ b/web/pgadmin/browser/templates/browser/js/messages.js
@@ -27,8 +27,10 @@ function(_, S, pgAdmin) {
     'NOTE_CTRL_LABEL': "{{ _("Note") }}",
   };
 
-  {% for key, val in current_app.messages.iteritems() %}messages['{{ key|safe }}'] = '{{ val|safe }}';
-  {% endfor %}
+{% for key in current_app.messages.keys() %}
+  messages['{{ key|safe }}'] = '{{ current_app.messages[key]|safe }}';
+
+{% endfor %}
 
   return pgBrowser.messages;
 
