diff --git a/app.py b/app.py
index 63bbdc6..79fac6a 100644
--- a/app.py
+++ b/app.py
@@ -75,7 +75,7 @@ def load_or_create_device(
                 if str(row[1]) != str(organization_id):
                     raise RuntimeError(
                     "Das Gerät ist bereits einer anderen Organization zugeordnet."
-                )
+                    )
                 cur.execute(
                     """
                     UPDATE devices
@@ -110,6 +110,7 @@ def load_or_create_device(
                     VALUES (%s, %s, %s, %s)
                     RETURNING
                         id,
+                        organization_id,
                         device_fingerprint,
                         hostname,
                         created_at,
@@ -129,10 +130,10 @@ def load_or_create_device(
     device = {
         "id": str(row[0]),
         "organization_id": str(row[1]),
-        "device_fingerprint": row[1],
-        "hostname": row[2],
-        "created_at": row[3].isoformat(),
-        "last_seen": row[4].isoformat(),
+        "device_fingerprint": row[2],
+        "hostname": row[3],
+        "created_at": row[4].isoformat(),
+        "last_seen": row[5].isoformat(),
     }
 
     return device, created