diff --git a/models/system/setting.go b/models/system/setting.go
index dc6145b41..6f333d6fd 100644
--- a/models/system/setting.go
+++ b/models/system/setting.go
@@ -266,7 +266,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 9d16a2360..a814af822 100644
--- a/modules/setting/picture.go
+++ b/modules/setting/picture.go
@@ -68,7 +68,7 @@ func newPictureService() {
 }
 
 func GetDefaultDisableGravatar() bool {
-	return !OfflineMode
+	return OfflineMode
 }
 
 func GetDefaultEnableFederatedAvatar(disableGravatar bool) bool {