diff --git a/api/src/main/java/telegram/files/DataVerticle.java b/api/src/main/java/telegram/files/DataVerticle.java
index e98d534..f391bb0 100644
--- a/api/src/main/java/telegram/files/DataVerticle.java
+++ b/api/src/main/java/telegram/files/DataVerticle.java
@@ -82,12 +82,12 @@ public class DataVerticle extends AbstractVerticle {
     public void stop(Promise<Void> stopPromise) throws Exception {
         if (pool != null) {
             pool.close().onComplete(r -> {
-                stopPromise.complete();
                 if (r.succeeded()) {
                     log.debug("Data verticle stopped!");
                 } else {
                     log.error("Failed to close data verticle: %s".formatted(r.cause().getMessage()));
                 }
+                stopPromise.complete();
             });
         }
     }
diff --git a/api/src/main/java/telegram/files/Start.java b/api/src/main/java/telegram/files/Start.java
index 17c3758..2d81ca3 100644
--- a/api/src/main/java/telegram/files/Start.java
+++ b/api/src/main/java/telegram/files/Start.java
@@ -64,6 +64,7 @@ public class Start {
             return;
         }
         vertx.undeploy(httpVerticle.deploymentID())
+                .compose(r -> vertx.undeploy(dataVerticle.deploymentID()))
                 .onComplete(res -> {
                     if (res.succeeded()) {
                         log.info("👋 Shutdown success");