diff --git a/roles/mongodb/templates/mongodb.service b/roles/mongodb/templates/mongodb.service
index 40f4f573f..1cfc98b05 100644
--- a/roles/mongodb/templates/mongodb.service
+++ b/roles/mongodb/templates/mongodb.service
@@ -6,7 +6,9 @@ After=syslog.target network.target
 Type=simple
 User=mongodb
 Group=mongodb
+ExecStartPre=/usr/bin/mongod --repair --dbpath {{ mongodb_db_path }}
 ExecStart=/usr/bin/mongod -f /etc/mongod.conf
+ExecStop=/usr/bin/killall mongod
  
 [Install]
 WantedBy=multi-user.target