diff --git a/src/freedombone-utils-mongodb b/src/freedombone-utils-mongodb
index b6a96554..3ad23153 100755
--- a/src/freedombone-utils-mongodb
+++ b/src/freedombone-utils-mongodb
@@ -103,8 +103,7 @@ function remove_mongodb {
     removemongo=
     if [ -f $MONGODB_APPS_FILE ]; then
         sed -i "/$app_name/d" $MONGODB_APPS_FILE
-        mongoapps=$(cat $MONGODB_APPS_FILE)
-        if [ ${#mongoapps} -lt 3 ]; then
+        if [ ! -s $MONGODB_APPS_FILE ]; then
             removemongo=1
         fi
     else
@@ -113,6 +112,7 @@ function remove_mongodb {
 
     if [ $removemongo ]; then
         apt-get -yq remove mongodb mongo-tools
+        apt-get -yq autoremove
         if [ -d /var/lib/mongodb ]; then
             rm -rf /var/lib/mongodb
         fi