diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index fbd28a0f..d6746394 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,19 @@
+- commits:
+    - subject: Throw if target states gets a 304 without an ETAG
+      hash: f471ad736c40afe7e4b50cb0fc46e8894d8dcdd7
+      body: |
+        The API uses 304 as a mechanism for load management on target state
+        requests. This may cause that the supervisor receives a 304 response
+        without having received a copy of the target state first, leading to
+        issues. This change checks for an etag when receiving a 304, throwing an
+        exception otherwise.
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+  version: 12.11.30
+  date: 2022-01-26T14:30:25.966Z
 - commits:
     - subject: 'patch: Update fleet terminology for application update locks'
       hash: 6357d3541ea726db565be947b3f9e4484707389c
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaff51dd..62d32c5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v12.11.30
+## (2022-01-26)
+
+* Throw if target states gets a 304 without an ETAG [Felipe Lalanne]
+
 # v12.11.29
 ## (2022-01-20)
 
diff --git a/VERSION b/VERSION
index ed736b8b..a67920dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.11.29
\ No newline at end of file
+12.11.30
\ No newline at end of file
diff --git a/balena.yml b/balena.yml
index cafe34f4..e64f9bb1 100644
--- a/balena.yml
+++ b/balena.yml
@@ -2,4 +2,4 @@ name: balena-supervisor
 description: 'Balena Supervisor: balena''s agent on devices.'
 joinable: false
 type: sw.application
-version: 12.11.29
+version: 12.11.30
diff --git a/package-lock.json b/package-lock.json
index 194d4dee..0963a6df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "12.11.29",
+  "version": "12.11.30",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f8110d7d..8c738699 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "balena-supervisor",
   "description": "This is balena's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as the balena API informs it to.",
-  "version": "12.11.29",
+  "version": "12.11.30",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -139,6 +139,6 @@
     }
   },
   "versionist": {
-    "publishedAt": "2022-01-20T12:51:52.693Z"
+    "publishedAt": "2022-01-26T14:30:26.190Z"
   }
 }