diff --git a/src/.env b/src/.env
index 322724525..d047e94ad 100644
--- a/src/.env
+++ b/src/.env
@@ -16,7 +16,7 @@ DOCKER_IMAGE_BACKEND=pom_backend
 DOCKER_IMAGE_FRONTEND=pom_frontend
 
 # Backend
-PRIVATIZE_API=False
+PRIVATIZE_API=
 TESTING=True
 BACKEND_CORS_ORIGINS="http://localhost,http://localhost:5173,https://localhost,https://localhost:5173"
 PROJECT_NAME="pathofmodifiers"
@@ -31,7 +31,7 @@ SMTP_USER=pomodifiers@outlook.com
 SMTP_PASSWORD=changethis
 
 # Data retrieval
-MANUAL_NEXT_CHANGE_ID=False
+MANUAL_NEXT_CHANGE_ID=
 NEXT_CHANGE_ID=2464293076-2443587902-2368433646-2624156651-2552811860
 POE_PUBLIC_STASHES_AUTH_TOKEN=changethis
 CURRENT_SOFTCORE_LEAGUE=Necropolis
diff --git a/src/backend_data_retrieval/data_retrieval/external_data_retrieval/data_retrieval/poe_api_retrieval/poe_api.py b/src/backend_data_retrieval/data_retrieval/external_data_retrieval/data_retrieval/poe_api_retrieval/poe_api.py
index 12cd1d295..8e72a3c4a 100644
--- a/src/backend_data_retrieval/data_retrieval/external_data_retrieval/data_retrieval/poe_api_retrieval/poe_api.py
+++ b/src/backend_data_retrieval/data_retrieval/external_data_retrieval/data_retrieval/poe_api_retrieval/poe_api.py
@@ -1,3 +1,4 @@
+import os
 import requests
 import time
 import logging
@@ -460,4 +461,5 @@ def dump_stream(self, track_progress: bool = True) -> Iterator[pd.DataFrame]:
                 current_time = time.perf_counter()
                 time_since_launch = current_time - self.time_of_launch
                 if time_since_launch > 3600:
-                    raise ProgramRunTooLongException
+                    print("Program has run for more than an hour, shutting down.")
+                    os._exit(0)
diff --git a/src/backend_data_retrieval/data_retrieval/prestart.sh b/src/backend_data_retrieval/data_retrieval/prestart.sh
index e3e299e1b..9ebd22335 100755
--- a/src/backend_data_retrieval/data_retrieval/prestart.sh
+++ b/src/backend_data_retrieval/data_retrieval/prestart.sh
@@ -1,10 +1,14 @@
-#! /usr/bin/env bash
+#!/bin/bash
 
 python dataretrieval_pre_start.py
 
 # Create initial data in DB
 python modifier_data_deposit/deposit_modifier_data.py
 
-while true; do
-    python external_data_retrieval/main.py
-done
\ No newline at end of file
+
+
+while true
+do
+ python external_data_retrieval/main.py || echo "App crashed... restarting..." >&2
+ echo "Press Ctrl-C to quit." && sleep 1
+done
diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml
index 5bbd9a537..13cd77a9b 100644
--- a/src/docker-compose.override.yml
+++ b/src/docker-compose.override.yml
@@ -55,7 +55,7 @@ services:
     command: /start-reload.sh
 
   backend-data-retrieval:
-    restart: "no"
+    restart: always
     ports:
       - "8889:8889"
     volumes:
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index bb298ed3a..56ec63532 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -82,6 +82,7 @@ services:
 
   backend-data-retrieval:
     image: backend_data_retrieval:1.0.0
+    restart: always
     depends_on:
       db:
         condition: service_healthy