diff --git a/install-mattermost.sh b/install-mattermost.sh
index d9740f2..874f9bf 100755
--- a/install-mattermost.sh
+++ b/install-mattermost.sh
@@ -1323,11 +1323,26 @@ echo
 echo -e "\033[37m\033[1mSetup Mattermost to use systemd for starting and stopping..\033[m"
 echo
 
+if [[ "$DB_TYPE" = "pgsql" ]] ; then
+   DATABASE_SYSTEMD_SERVICE="postgresql.service"
+else
+   DATABASE_SYSTEMD_SERVICE="mysql.service"
+fi
+
+echononl "Check systemd unit '${DATABASE_SYSTEMD_SERVICE}'.."
+if systemctl cat "$DATABASE_SYSTEMD_SERVICE" > "$log_file" 2>&1 ; then
+   echo_ok
+else
+   echo_failed
+   fatal "Systemd unit '${DATABASE_SYSTEMD_SERVICE}' does not exist."
+fi
+
 echononl "Create a systemd unit file.."
 cat <<EOF > /etc/systemd/system/mattermost.service 2>"$log_file"
 [Unit]
 Description=Mattermost
-After=network.target
+After=network.target ${DATABASE_SYSTEMD_SERVICE}
+Requires=${DATABASE_SYSTEMD_SERVICE}
 
 [Service]
 Type=notify