diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
index a8c980ce7..99315d77b 100644
--- a/app/Models/Auth/User.php
+++ b/app/Models/Auth/User.php
@@ -84,13 +84,15 @@ class User extends Authenticatable
     {
         // Check if we should use gravatar
         if (setting('general.use_gravatar', '0') == '1') {
-            // Check for gravatar
-            $url = 'https://www.gravatar.com/avatar/' . md5(strtolower($this->getAttribute('email'))).'?size=90&d=404';
-
-            $client = new \GuzzleHttp\Client(['verify' => false]);
-
             try {
-                $value = $client->request('GET', $url)->getBody()->getContents();
+                // Check for gravatar
+                $url = 'https://www.gravatar.com/avatar/' . md5(strtolower($this->getAttribute('email'))).'?size=90&d=404';
+
+                $client = new \GuzzleHttp\Client(['verify' => false]);
+
+                $client->request('GET', $url)->getBody()->getContents();
+
+                $value = $url;
             } catch (RequestException $e) {
                 // 404 Not Found
             }
diff --git a/resources/views/partials/admin/header.blade.php b/resources/views/partials/admin/header.blade.php
index f8b4e54b4..da0e10981 100644
--- a/resources/views/partials/admin/header.blade.php
+++ b/resources/views/partials/admin/header.blade.php
@@ -156,7 +156,11 @@
                 <li class="dropdown user user-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                         @if ($user->picture)
-                            <img src="{{ Storage::url($user->picture) }}" class="user-image" alt="User Image">
+                            @if (setting('general.use_gravatar', '0') == '1')
+                                <img src="{{ $user->picture }}" class="user-image" alt="User Image">
+                            @else
+                                <img src="{{ Storage::url($user->picture) }}" class="user-image" alt="User Image">
+                            @endif
                         @else
                             <i class="fa fa-user-o"></i>
                         @endif
@@ -168,7 +172,11 @@
                         <!-- User image -->
                         <li class="user-header">
                             @if ($user->picture)
-                            <img src="{{ Storage::url($user->picture) }}" class="img-circle" alt="User Image">
+                                @if (setting('general.use_gravatar', '0') == '1')
+                                    <img src="{{ $user->picture }}" class="img-circle" alt="User Image">
+                                @else
+                                    <img src="{{ Storage::url($user->picture) }}" class="img-circle" alt="User Image">
+                                @endif
                             @else
                                 <i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i>
                             @endif