diff --git a/models/system/setting.go b/models/system/setting.go
index b4011b1b3ed..d61b7fdb0f2 100644
--- a/models/system/setting.go
+++ b/models/system/setting.go
@@ -267,7 +267,7 @@ func Init() error {
 		enableFederatedAvatar = false
 	}
 
-	if disableGravatar || !enableFederatedAvatar {
+	if enableFederatedAvatar || !disableGravatar {
 		var err error
 		GravatarSourceURL, err = url.Parse(setting.GravatarSource)
 		if err != nil {
diff --git a/modules/setting/picture.go b/modules/setting/picture.go
index af9041ade36..4b61d51ac55 100644
--- a/modules/setting/picture.go
+++ b/modules/setting/picture.go
@@ -69,7 +69,7 @@ func newPictureService() {
 }
 
 func GetDefaultDisableGravatar() bool {
-	return !OfflineMode
+	return OfflineMode
 }
 
 func GetDefaultEnableFederatedAvatar(disableGravatar bool) bool {