diff --git a/flyfly/src/main/resources/application.properties b/flyfly/src/main/resources/application.properties
index 15b8189..6df4b50 100644
--- a/flyfly/src/main/resources/application.properties
+++ b/flyfly/src/main/resources/application.properties
@@ -1,3 +1,6 @@
 spring.banner.location=classpath:banner.txt
 #logging.level.root=WARN
+#Enabling graceful shutdown
+server.shutdown=graceful
+spring.lifecycle.timeout-per-shutdown-phase=15s
 logging.level.com.flyspring.flyfly.commands=INFO