diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
index dbeca1dfdfd9..3a527cffdada 100644
--- a/resources/views/clients/show.blade.php
+++ b/resources/views/clients/show.blade.php
@@ -6,19 +6,6 @@
     <script src="{{ asset('js/select2.min.js') }}" type="text/javascript"></script>
     <link href="{{ asset('css/select2.css') }}" rel="stylesheet" type="text/css"/>
 
-    @if ($client->showMap())
-        <style>
-          #map {
-            width: 100%;
-            height: 200px;
-            border-width: 1px;
-            border-style: solid;
-            border-color: #ddd;
-          }
-        </style>
-
-        <script src="https://maps.googleapis.com/maps/api/js?key={{ env('GOOGLE_MAPS_API_KEY') }}"></script>
-    @endif
 @stop
 
 
@@ -233,8 +220,14 @@
     </div>
 
     @if ($client->showMap())
-        <div id="map"></div>
-        <br/>
+
+        <iframe
+          width="100%"
+          height="200px"
+          frameborder="0" style="border:0"
+          src="https://www.google.com/maps/embed/v1/place?key={{ env('GOOGLE_MAPS_API_KEY') }}&q={!! e("{$client->address1} {$client->address2} {$client->city} {$client->state} {$client->postal_code} " . ($client->country ? $client->country->getName() : '')) !!}" allowfullscreen>
+        </iframe>
+
     @endif
 
 	<ul class="nav nav-tabs nav-justified">
@@ -456,50 +449,6 @@
         })
     }
 
-    @if ($client->showMap())
-        function initialize() {
-            var mapCanvas = document.getElementById('map');
-            var mapOptions = {
-                zoom: {{ DEFAULT_MAP_ZOOM }},
-                mapTypeId: google.maps.MapTypeId.ROADMAP,
-                zoomControl: true,
-            };
-
-            var map = new google.maps.Map(mapCanvas, mapOptions)
-            var address = {!! json_encode(e("{$client->address1} {$client->address2} {$client->city} {$client->state} {$client->postal_code} " . ($client->country ? $client->country->getName() : ''))) !!};
-
-            geocoder = new google.maps.Geocoder();
-            geocoder.geocode( { 'address': address}, function(results, status) {
-                if (status == google.maps.GeocoderStatus.OK) {
-                  if (status != google.maps.GeocoderStatus.ZERO_RESULTS) {
-                    var result = results[0];
-                    map.setCenter(result.geometry.location);
-
-                    var infowindow = new google.maps.InfoWindow(
-                        { content: '<b>'+result.formatted_address+'</b>',
-                        size: new google.maps.Size(150, 50)
-                    });
-
-                    var marker = new google.maps.Marker({
-                        position: result.geometry.location,
-                        map: map,
-                        title:address,
-                    });
-                    google.maps.event.addListener(marker, 'click', function() {
-                        infowindow.open(map, marker);
-                    });
-                } else {
-                    $('#map').hide();
-                }
-            } else {
-              $('#map').hide();
-          }
-      });
-    }
-
-    google.maps.event.addDomListener(window, 'load', initialize);
-    @endif
-
 	</script>
 
 @stop