diff --git a/src/common/optparser.py b/src/common/optparser.py
index 18cfe2802808a9e442b8bdae64ed1bae0fc5ed0c..bc455e1f6531e3f595bed62d261e4c4403bc0dff 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -659,9 +659,10 @@ class OptionsParser:
 	def update_config_to_01214(self):
 		for status in ['online', 'chat', 'away', 'xa', 'dnd', 'invisible',
 		'offline']:
-			gajim.config.add_per('statusmsg', '_last_' + status)
-			gajim.config.set_per('statusmsg', '_last_' + status, 'message',
-				self.old_values['last_status_msg_' + status])
+			if 'last_status_msg_' + status in self.old_values:
+				gajim.config.add_per('statusmsg', '_last_' + status)
+				gajim.config.set_per('statusmsg', '_last_' + status, 'message',
+					self.old_values['last_status_msg_' + status])
 		gajim.config.set('version', '0.12.1.4')
 
 	def update_config_to_01215(self):