diff --git a/models/user.go b/models/user.go
index ea5041bdff..f3a6c38f62 100644
--- a/models/user.go
+++ b/models/user.go
@@ -124,7 +124,7 @@ func (u *User) AvatarLink() string {
 	switch {
 	case u.UseCustomAvatar:
 		return setting.AppSubUrl + "/avatars/" + com.ToStr(u.Id)
-	case setting.DisableGravatar:
+	case setting.DisableGravatar, setting.OfflineMode:
 		return setting.AppSubUrl + "/img/avatar_default.jpg"
 	case setting.Service.EnableCacheAvatar:
 		return setting.AppSubUrl + "/avatar/" + u.Avatar
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 55e6dffd96..92f493afe2 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -171,7 +171,7 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string
 
 // AvatarLink returns avatar link by given e-mail.
 func AvatarLink(email string) string {
-	if setting.DisableGravatar {
+	if setting.DisableGravatar || setting.OfflineMode {
 		return setting.AppSubUrl + "/img/avatar_default.jpg"
 	}