diff --git a/backend/pb/pb.go b/backend/pb/pb.go
index cc7e7613..9463b076 100644
--- a/backend/pb/pb.go
+++ b/backend/pb/pb.go
@@ -146,9 +146,19 @@ func StartPocketBase(distDirFS fs.FS) {
 		return nil
 	})
 
+	App.OnTerminate().PreAdd(func(e *core.TerminateEvent) error {
+		logger.Info.Println("Stopping cronjobs")
+		ctx := cronjobs.CronPing.Stop()
+		<-ctx.Done()
+		ctx = cronjobs.CronWakeShutdown.Stop()
+		<-ctx.Done()
+		return nil
+	})
+
 	if err := App.Start(); err != nil {
 		logger.Error.Fatalln(err)
 	}
+
 }
 
 func importSettings() error {