diff --git a/.env.example b/.env.example
index 2d1db72861cc..55c90496ae2c 100644
--- a/.env.example
+++ b/.env.example
@@ -46,6 +46,7 @@ API_SECRET=password
 #GOOGLE_CLIENT_SECRET=
 #GOOGLE_OAUTH_REDIRECT=http://ninja.dev/auth/google
 
+GOOGLE_MAPS_ENABLED=true
 #GOOGLE_MAPS_API_KEY=
 
 #S3_KEY=
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 02da4dc912a5..92cabf0bc89c 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -379,6 +379,14 @@ class Client extends EntityModel
         return ENTITY_CLIENT;
     }
 
+    /**
+     * @return bool
+     */
+    public function showMap()
+    {
+        return $this->hasAddress() && env('GOOGLE_MAPS_ENABLED') !== false;
+    }
+
     /**
      * @return bool
      */
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index addf98e1d1ec..466c6cc8fa47 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -267,6 +267,14 @@ class Vendor extends EntityModel
         return 'vendor';
     }
 
+    /**
+     * @return bool
+     */
+    public function showMap()
+    {
+        return $this->hasAddress() && env('GOOGLE_MAPS_ENABLED') !== false;
+    }
+
     /**
      * @return bool
      */
diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
index fe5c88e6ab3c..23c60e272e87 100644
--- a/resources/views/clients/show.blade.php
+++ b/resources/views/clients/show.blade.php
@@ -6,7 +6,7 @@
     <script src="{{ asset('js/select2.min.js') }}" type="text/javascript"></script>
     <link href="{{ asset('css/select2.css') }}" rel="stylesheet" type="text/css"/>
 
-    @if ($client->hasAddress())
+    @if ($client->showMap())
         <style>
           #map {
             width: 100%;
@@ -186,7 +186,7 @@
     </div>
     </div>
 
-    @if ($client->hasAddress())
+    @if ($client->showMap())
         <div id="map"></div>
         <br/>
     @endif
@@ -332,7 +332,7 @@
 		});
 	}
 
-    @if ($client->hasAddress())
+    @if ($client->showMap())
         function initialize() {
             var mapCanvas = document.getElementById('map');
             var mapOptions = {
diff --git a/resources/views/vendors/show.blade.php b/resources/views/vendors/show.blade.php
index 8ba8258477d3..453c0f2b9025 100644
--- a/resources/views/vendors/show.blade.php
+++ b/resources/views/vendors/show.blade.php
@@ -6,7 +6,7 @@
     <script src="{{ asset('js/select2.min.js') }}" type="text/javascript"></script>
     <link href="{{ asset('css/select2.css') }}" rel="stylesheet" type="text/css"/>
 
-    @if ($vendor->hasAddress())
+    @if ($vendor->showMap())
         <style>
           #map {
             width: 100%;
@@ -167,7 +167,7 @@
     </div>
     </div>
 
-    @if ($vendor->hasAddress())
+    @if ($vendor->showMap())
         <div id="map"></div>
         <br/>
     @endif
@@ -219,7 +219,7 @@
 		}
 	}
 
-    @if ($vendor->hasAddress())
+    @if ($vendor->showMap())
         function initialize() {
             var mapCanvas = document.getElementById('map');
             var mapOptions = {