diff --git a/app/views/admin/visualizations/public_dataset.html.erb b/app/views/admin/visualizations/public_dataset.html.erb
index afc24e6171..9669ae8830 100644
--- a/app/views/admin/visualizations/public_dataset.html.erb
+++ b/app/views/admin/visualizations/public_dataset.html.erb
@@ -13,7 +13,7 @@
 
 <% content_for(:js) do %>
   <% if @table.map.provider == 'googlemaps' %>
-    <%= insert_google_maps(@user.google_maps_query_string) %>
+    <%= insert_google_maps(@visualization.user.google_maps_query_string) %>
   <% end %>
 
   <%= javascript_include_tag 'common', 'common_vendor', 'public_table_new' %>
diff --git a/app/views/admin/visualizations/public_map.html.erb b/app/views/admin/visualizations/public_map.html.erb
index fbfecac488..159d8253c7 100644
--- a/app/views/admin/visualizations/public_map.html.erb
+++ b/app/views/admin/visualizations/public_map.html.erb
@@ -302,7 +302,7 @@
   <%= insert_trackjs('embeds', Cartodb.get_config(:trackjs, 'frequency')) %>
 
   <% if @visualization.map.provider == 'googlemaps' %>
-    <%= insert_google_maps(@google_maps_query_string) %>
+    <%= insert_google_maps(@visualization.user.google_maps_query_string) %>
   <% end %>
 
   <script>
diff --git a/app/views/admin/visualizations/show.html.erb b/app/views/admin/visualizations/show.html.erb
index ae257a6a29..0328f7d2aa 100644
--- a/app/views/admin/visualizations/show.html.erb
+++ b/app/views/admin/visualizations/show.html.erb
@@ -17,8 +17,8 @@
   </script>
 
   <% content_for(:js) do %>
-    <% if !@google_maps_query_string.blank? %>
-      <%= insert_google_maps(@google_maps_query_string) %>
+    <% if @visualization.map.provider == 'googlemaps' %>
+      <%= insert_google_maps(@visualization.user.google_maps_query_string) %>
     <% end %>
     <%= editor_javascript_include_tag 'cdb.js','models.js', 'templates.js', 'templates_mustache.js', 'table.js', 'editor.js' %>
   <% end %>
diff --git a/app/views/carto/builder/datasets/show.html.erb b/app/views/carto/builder/datasets/show.html.erb
index b9c1ff0abf..b5c8fbc9c1 100644
--- a/app/views/carto/builder/datasets/show.html.erb
+++ b/app/views/carto/builder/datasets/show.html.erb
@@ -12,8 +12,8 @@
   var geocoderConfiguration = <%= safe_js_object geocoder_config.to_json %>;
 </script>
 
-<% if @canonical_visualization.map.provider == 'googlemaps' && @google_maps_query_string.present? %>
-  <%= insert_google_maps(@google_maps_query_string) %>
+<% if @canonical_visualization.map.provider == 'googlemaps' %>
+  <%= insert_google_maps(@canonical_visualization.user.google_maps_query_string) %>
 <% end %>
 
 <%= javascript_include_tag 'common', 'common_vendor', 'dataset' %>
diff --git a/app/views/carto/builder/visualizations/show.html.erb b/app/views/carto/builder/visualizations/show.html.erb
index 11efd84312..3733b2f3b4 100644
--- a/app/views/carto/builder/visualizations/show.html.erb
+++ b/app/views/carto/builder/visualizations/show.html.erb
@@ -21,8 +21,8 @@
   var geocoderConfiguration = <%= safe_js_object geocoder_config.to_json %>;
 </script>
 
-<% if @google_maps_query_string.present? %>
-  <%= insert_google_maps(@google_maps_query_string) %>
+<% if @visualization.map.provider == 'googlemaps' %>
+  <%= insert_google_maps(@visualization.user.google_maps_query_string) %>
 <% end %>
 
 <%= javascript_include_tag 'common.js' %>