diff --git a/src/gui_interface.py b/src/gui_interface.py
index 5a92b1c2d1d83954ab09bb8965cd5b76059c828e..e193bb241a80c855b74ec54fffc22cfa560e788b 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -201,7 +201,7 @@ class Interface:
         path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48)
         account = obj.conn.name
         notify.popup(_('Connection Failed'), account, account,
-            'connection_failed', path, obj.title, obj.msg)
+            '', path, obj.title, obj.msg)
 
     def unblock_signed_in_notifications(self, account):
         gajim.block_signed_in_notifications[account] = False
@@ -664,7 +664,7 @@ class Interface:
         else:
             path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48)
             account = obj.conn.name
-            notify.popup('warning', account, account, 'warning', path,
+            notify.popup('warning', account, account, '', path,
                 _('OpenPGP Passphrase Incorrect'),
                 _('You are currently connected without your OpenPGP key.'))
         self.forget_gpg_passphrase(obj.keyID)
diff --git a/src/notify.py b/src/notify.py
index 1fd2dca82e7d2f3d8221f60bc6bd82b70e6d1f8f..0f90d1f096666fd8a3cba810e16c104722bc7300 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -332,7 +332,7 @@ class DesktopNotification:
         version = self.version
         if version[:2] == [0, 2]:
             actions = {}
-            if 'actions' in self.capabilities:
+            if 'actions' in self.capabilities and self.msg_type:
                 actions = {'default': 0}
             try:
                 self.notif.Notify(
@@ -381,7 +381,7 @@ class DesktopNotification:
                     self.path_to_image = os.path.abspath(
                         gtkgui_helpers.get_icon_path('gajim', 48))
                 actions = ()
-                if 'actions' in self.capabilities:
+                if 'actions' in self.capabilities and self.msg_type:
                     actions = (dbus.String('default'), dbus.String(
                         self.event_type))
                 try: