diff --git a/Riot/Modules/Contacts/Views/ContactTableViewCell.m b/Riot/Modules/Contacts/Views/ContactTableViewCell.m
index 02e76bf87..3b1a27c38 100644
--- a/Riot/Modules/Contacts/Views/ContactTableViewCell.m
+++ b/Riot/Modules/Contacts/Views/ContactTableViewCell.m
@@ -316,33 +316,34 @@
 
 - (void)refreshContactPresence
 {
-    NSString* presenceText;
-    NSString* matrixId = self.firstMatrixId;
-    
-    if (matrixId)
-    {
-        MXUser *user = nil;
+    if (BuildSettings.allowLocalContactPresence) {
+        NSString* presenceText;
+        NSString* matrixId = self.firstMatrixId;
         
-        // Consider here all sessions reported into contact manager
-        NSArray* mxSessions = [MXKContactManager sharedManager].mxSessions;
-        for (MXSession *mxSession in mxSessions)
+        if (matrixId)
         {
-            user = [mxSession userWithUserId:matrixId];
-            if (user)
+            MXUser *user = nil;
+            
+            // Consider here all sessions reported into contact manager
+            NSArray* mxSessions = [MXKContactManager sharedManager].mxSessions;
+            for (MXSession *mxSession in mxSessions)
             {
-                break;
+                user = [mxSession userWithUserId:matrixId];
+                if (user)
+                {
+                    break;
+                }
             }
+
+            presenceText = [Tools presenceText:user];
         }
-
-        presenceText = [Tools presenceText:user];
+        else if (contact.isThirdPartyInvite)
+        {
+            presenceText =  [VectorL10n roomParticipantsOffline];
+        }
+        
+        self.contactInformationLabel.text = presenceText;
     }
-    else if (contact.isThirdPartyInvite)
-    {
-        presenceText =  [VectorL10n roomParticipantsOffline];
-    }
-    
-    self.contactInformationLabel.text = presenceText;
-
 }
 
 #pragma mark - events
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.m
index c55d87a0a..020f99547 100644
--- a/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.m
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAccountDetailsViewController.m
@@ -221,7 +221,7 @@ NSString* const kMXKAccountDetailsLinkedEmailCellId = @"kMXKAccountDetailsLinked
                 [self updateSaveUserInfoButtonStatus];
                 
                 // Display user's presence
-                UIColor *presenceColor = [MXKAccount presenceColor:self->_mxAccount.userPresence];
+                UIColor *presenceColor = [MXKAccount presenceColor:MXPresenceOffline];
                 if (presenceColor)
                 {
                     self->userPictureButton.layer.borderWidth = 2;
diff --git a/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.m b/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.m
index c47f5e4e5..906ad2d0a 100644
--- a/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.m
+++ b/Riot/Modules/MatrixKit/Views/Account/MXKAccountTableViewCell.m
@@ -49,7 +49,7 @@
                         previewImage:self.picturePlaceholder
                         mediaManager:mxAccount.mxSession.mediaManager];
         
-        presenceColor = [MXKAccount presenceColor:mxAccount.userPresence];
+        presenceColor = [MXKAccount presenceColor:MXPresenceOffline];
     }
     else
     {
diff --git a/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.m b/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.m
index 4bf68852f..7c57638b2 100644
--- a/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.m
+++ b/Riot/Modules/MatrixKit/Views/RoomMemberList/MXKRoomMemberTableViewCell.m
@@ -135,7 +135,7 @@
                 // existing user ?
                 if (user)
                 {
-                    thumbnailBorderColor = [MXKAccount presenceColor:user.presence];
+                    thumbnailBorderColor = [MXKAccount presenceColor:MXPresenceOffline];
                     presenceText = [self lastActiveTime];
                     // Keep last seen range to update it
                     lastSeenRange = NSMakeRange(self.userLabel.text.length + 2, presenceText.length);
@@ -158,7 +158,7 @@
         }
         
         // and the presence text (if any)
-        if (presenceText)
+        if (presenceText && BuildSettings.allowLocalContactPresence)
         {
             NSString* extraText = [NSString stringWithFormat:@"(%@)", presenceText];
             self.userLabel.text = [NSString stringWithFormat:@"%@ %@", self.userLabel.text, extraText];