diff --git a/src/gajim.py b/src/gajim.py
index bc1077ff52c7a2b051d402c24d2f9c8831ba8926..e289370acc091e4ed61f9a286865a8f0fae4f265 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -3021,11 +3021,7 @@ class Interface:
 				self.roster.send_status(a, show, message)
 				self.roster.send_pep(a, pep_dict)
 		for show in shows:
-			if len(shows[show]) == 1:
-				pep_dict = helpers.get_pep_dict(shows[show][0])
-			else:
-				pep_dict = helpers.get_global_pep()
-			message = self.roster.get_status_message(show, pep_dict, on_message)
+			message = self.roster.get_status_message(show, on_message)
 		return False
 
 	def show_systray(self):
diff --git a/src/roster_window.py b/src/roster_window.py
index b57552afb75180d27633027931620aa71ded7ced..8b152de04923c963694af2938337a21f967e0270 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2099,16 +2099,17 @@ class RosterWindow:
 			always_ask
 		show_pep can be False to hide pep things from status message or True
 		'''
+		empty_pep = {'activity': '', 'subactivity': '', 'activity_text': '',
+			'mood': '', 'mood_text': ''}
 		if show in gajim.config.get_per('defaultstatusmsg'):
 			if gajim.config.get_per('defaultstatusmsg', show, 'enabled'):
 				on_response(gajim.config.get_per('defaultstatusmsg', show,
-					'message'), None)
+					'message'), empty_pep)
 				return
 		if not always_ask and ((show == 'online' and not gajim.config.get(
 		'ask_online_status')) or (show in ('offline', 'invisible') and not \
 		gajim.config.get('ask_offline_status'))):
-			on_response('', {'activity': '', 'subactivity': '',
-				'activity_text': '', 'mood': '', 'mood_text': ''})
+			on_response('', empty_pep)
 			return
 
 		dlg = dialogs.ChangeStatusMessageDialog(on_response, show, show_pep)