diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 053fd66e..c3ea3169 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -189,7 +189,7 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t *
 					EVENT(handle, &event);
 				} else {
 					// -Rs, we keep optdepends
-					alpm_list_remove(lp, optdep, _alpm_pkg_dep_cmp,NULL);
+					alpm_list_remove(lp, optdep, _alpm_pkg_dep_cmp, NULL);
 				}
 			}
 			free(optstring);
diff --git a/test/pacman/meson.build b/test/pacman/meson.build
index 4a73b600..3de04cd0 100644
--- a/test/pacman/meson.build
+++ b/test/pacman/meson.build
@@ -126,6 +126,7 @@ pacman_tests = [
   'tests/reason001.py',
   'tests/remove-assumeinstalled.py',
   'tests/remove-directory-replaced-with-symlink.py',
+  'tests/remove-keep-optdepend-of-installed-package.py',
   'tests/remove-optdepend-of-installed-package.py',
   'tests/remove-print-empty-replacements.py',
   'tests/remove-recursive-cycle.py',
diff --git a/test/pacman/tests/remove-keep-optdepend-of-installed-package.py b/test/pacman/tests/remove-keep-optdepend-of-installed-package.py
new file mode 100644
index 00000000..103e4802
--- /dev/null
+++ b/test/pacman/tests/remove-keep-optdepend-of-installed-package.py
@@ -0,0 +1,21 @@
+self.description = "Do not remove packages which is an optdepend of another package"
+
+p1 = pmpkg("a")
+p1.depends = ["b"]
+self.addpkg2db("local", p1)
+
+p2 = pmpkg("b")
+self.addpkg2db("local", p2)
+
+
+p3 = pmpkg("c")
+p3.optdepends = ["b: for foobar"]
+self.addpkg2db("local", p3)
+
+self.args = "-Rs %s" % p1.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PKG_EXIST=%s" % p1.name)
+self.addrule("PKG_EXIST=%s" % p2.name)
+self.addrule("PKG_EXIST=%s" % p3.name)
+self.addrule("!PACMAN_OUTPUT=%s optionally requires %s" % (p3.name, p2.name))
diff --git a/test/pacman/tests/remove-optdepend-of-installed-package.py b/test/pacman/tests/remove-optdepend-of-installed-package.py
index 4973df5f..10cbae3b 100644
--- a/test/pacman/tests/remove-optdepend-of-installed-package.py
+++ b/test/pacman/tests/remove-optdepend-of-installed-package.py
@@ -1,15 +1,21 @@
 self.description = "Remove packages which is an optdepend of another package"
 
-p1 = pmpkg("dep")
+p1 = pmpkg("a")
+p1.depends = ["b"]
 self.addpkg2db("local", p1)
 
-p2 = pmpkg("pkg")
-p2.optdepends = ["dep: for foobar"]
+p2 = pmpkg("b")
 self.addpkg2db("local", p2)
 
-self.args = "-R %s" % p1.name
+
+p3 = pmpkg("c")
+p3.optdepends = ["b: for foobar"]
+self.addpkg2db("local", p3)
+
+self.args = "-Rss %s" % p1.name
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("!PKG_EXIST=%s" % p1.name)
-self.addrule("PKG_EXIST=%s" % p2.name)
-self.addrule("PACMAN_OUTPUT=%s optionally requires %s" % (p2.name, p1.name))
+self.addrule("!PKG_EXIST=%s" % p2.name)
+self.addrule("PKG_EXIST=%s" % p3.name)
+self.addrule("PACMAN_OUTPUT=%s optionally requires %s" % (p3.name, p2.name))