diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index 9cf851234..f13760999 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -352,13 +352,9 @@ public void updateStatus(ProtocolProviderService protocolProvider)
                 presenceStatus = presenceStatusMenu.getOfflineStatus();
             else
             {
-                presenceStatus = presenceStatusMenu.getLastSelectedStatus();
+                presenceStatus = getLastPresenceStatus(protocolProvider);
                 if (presenceStatus == null)
-                {
-                    presenceStatus = getLastPresenceStatus(protocolProvider);
-                    if (presenceStatus == null)
-                        presenceStatus = presenceStatusMenu.getOnlineStatus();
-                }
+                    presenceStatus = presenceStatusMenu.getOnlineStatus();
             }
 
             presenceStatusMenu.updateStatus(presenceStatus);
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
index f121a8515..3f458ab98 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
@@ -49,8 +49,6 @@ public class PresenceStatusMenu
 
     private PresenceStatus onlineStatus;
 
-    private PresenceStatus lastSelectedStatus;
-
     private OperationSetPresence presence;
 
     /**
@@ -272,7 +270,6 @@ public void setSelectedStatus(PresenceStatus status)
                                 status.getStatusName());
 
         this.setSelected(selectedObject);
-        lastSelectedStatus = status;
 
         String tooltip = this.getToolTipText();
 
@@ -301,16 +298,6 @@ public PresenceStatus getOnlineStatus()
         return onlineStatus;
     }
 
-    /**
-     * Returns the status that is currently selected.
-     *
-     * @return the status that is currently selected
-     */
-    public PresenceStatus getLastSelectedStatus()
-    {
-        return lastSelectedStatus;
-    }
-
     /**
      * Loads resources for this component.
      */