diff --git a/community-containers/joplin-server/joplin-server.json b/community-containers/joplin-server/joplin-server.json
index d33f306c..5e57ba0a 100644
--- a/community-containers/joplin-server/joplin-server.json
+++ b/community-containers/joplin-server/joplin-server.json
@@ -6,6 +6,7 @@
             "display_name": "Joplin Server",
             "documentation": "https://github.com/nextcloud/all-in-one/tree/main/community-containers/joplin-server",
             "image": "joplin/server",
+            "restart": "unless-stopped",
             "depends_on": [
                 "nextcloud-aio-joplin-database"
             ],
@@ -35,6 +36,7 @@
             "image_tag": "18",
             "display_name": "Joplin Database (PostgreSQL)",
             "image": "postgres",
+            "restart": "unless-stopped",
             "internal_port": "5432",
             "environment": [
                 "POSTGRES_PASSWORD=%JOPLIN_DB_PASSWORD%",
@@ -57,4 +59,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}