diff --git a/client/src/apiTypes.ts b/client/src/apiTypes.ts
index f5665c185..d02a68677 100644
--- a/client/src/apiTypes.ts
+++ b/client/src/apiTypes.ts
@@ -23,8 +23,8 @@ export interface ApiAsset {
   id: AssetId;
   name: string;
   owner: string;
-  fileHash?: string;
-  children?: ApiAsset[];
+  fileHash: string | null;
+  children: ApiAsset[] | null;
   shares: ApiAssetShare[];
 }
 export interface ApiAssetShare {
diff --git a/client/src/assets/ui/drag.ts b/client/src/assets/ui/drag.ts
index bdbf398e5..a55984b71 100644
--- a/client/src/assets/ui/drag.ts
+++ b/client/src/assets/ui/drag.ts
@@ -68,7 +68,7 @@ async function onDrop(event: DragEvent): Promise<void> {
     }
 }
 
-function startDrag(event: DragEvent, file: AssetId, assetHash?: string): void {
+function startDrag(event: DragEvent, file: AssetId, assetHash: string | null): void {
     if (event.dataTransfer === null) return;
     if (!canEdit(file, false)) {
         return;
@@ -148,7 +148,7 @@ async function stopDrag(event: DragEvent, target: AssetId): Promise<void> {
 
 export interface DragComposable {
     dragState: Ref<number>;
-    startDrag: (event: DragEvent, file: AssetId, fileHash?: string) => void;
+    startDrag: (event: DragEvent, file: AssetId, fileHash: string | null) => void;
     moveDrag: (event: DragEvent) => void;
     leaveDrag: (event: DragEvent) => void;
     onDragEnd: (event: DragEvent) => void;
diff --git a/client/src/dashboard/games/CreateGame.vue b/client/src/dashboard/games/CreateGame.vue
index 72127aaa5..b279346f4 100644
--- a/client/src/dashboard/games/CreateGame.vue
+++ b/client/src/dashboard/games/CreateGame.vue
@@ -38,7 +38,7 @@ async function create(): Promise<void> {
 
 async function setLogo(): Promise<void> {
     const data = await modals.assetPicker();
-    if (data === undefined || data.fileHash === undefined) return;
+    if (data === undefined || data.fileHash === null) return;
     logo.path = data.fileHash;
     logo.id = data.id;
 }
diff --git a/client/src/dashboard/games/GameList.vue b/client/src/dashboard/games/GameList.vue
index 1007bfd07..cb927e614 100644
--- a/client/src/dashboard/games/GameList.vue
+++ b/client/src/dashboard/games/GameList.vue
@@ -105,7 +105,7 @@ async function setLogo(): Promise<void> {
         logo: data.id,
     });
     if (success.ok) {
-        state.focussed.logo = data.fileHash;
+        state.focussed.logo = data.fileHash ?? undefined;
     }
 }
 
diff --git a/client/src/game/dropAsset.ts b/client/src/game/dropAsset.ts
index db888483c..481918d2d 100644
--- a/client/src/game/dropAsset.ts
+++ b/client/src/game/dropAsset.ts
@@ -40,8 +40,7 @@ export async function handleDropEvent(event: DragEvent): Promise<void> {
     // External files are dropped
     if (!transferInfo && event.dataTransfer.files.length > 0) {
         for (const asset of await assetSystem.upload(event.dataTransfer.files, { target: () => assetState.raw.root })) {
-            if (asset.fileHash !== undefined)
-                await dropHelper({ assetHash: asset.fileHash, assetId: asset.id }, location);
+            if (asset.fileHash !== null) await dropHelper({ assetHash: asset.fileHash, assetId: asset.id }, location);
         }
     } else if (transferInfo) {
         const assetInfo = JSON.parse(transferInfo) as {
diff --git a/client/src/game/ui/settings/floor/PatternSettings.vue b/client/src/game/ui/settings/floor/PatternSettings.vue
index 73e2aeb15..f16b4b591 100644
--- a/client/src/game/ui/settings/floor/PatternSettings.vue
+++ b/client/src/game/ui/settings/floor/PatternSettings.vue
@@ -27,7 +27,7 @@ const backgroundPattern = computed(() => getPattern(props.pattern) ?? defaultPat
 
 async function setPatternImage(): Promise<void> {
     const data = await modals.assetPicker();
-    if (data === undefined || data.fileHash === undefined) return;
+    if (data === undefined || data.fileHash === null) return;
 
     emit("update:pattern", patternToString({ ...backgroundPattern.value, hash: data.fileHash }));
 }
diff --git a/client/src/game/ui/settings/shape/ExtraSettings.vue b/client/src/game/ui/settings/shape/ExtraSettings.vue
index 785203c37..a24bf92f5 100644
--- a/client/src/game/ui/settings/shape/ExtraSettings.vue
+++ b/client/src/game/ui/settings/shape/ExtraSettings.vue
@@ -47,7 +47,7 @@ const showSvgSection = computed(() => gameState.reactive.isDm && activeShapeStor
 
 async function uploadSvg(): Promise<void> {
     const asset = await modals.assetPicker();
-    if (asset === undefined || asset.fileHash === undefined) return;
+    if (asset === undefined || asset.fileHash === null) return;
 
     const shape = getShape(activeShapeStore.state.id!);
     if (shape === undefined) return;
@@ -165,18 +165,24 @@ function applyDDraft(): void {
 <template>
     <div class="panel restore-panel">
         <template v-if="showSvgSection">
-            <div class="spanrow header">{{ t('game.ui.selection.edit_dialog.extra.lighting_vision') }}</div>
+            <div class="spanrow header">{{ t("game.ui.selection.edit_dialog.extra.lighting_vision") }}</div>
             <template v-if="!hasPath">
-                <label for="edit_dialog-extra-upload_walls">{{ t('game.ui.selection.edit_dialog.extra.upload_walls') }} (svg)</label>
-                <button id="edit_dialog-extra-upload_walls" @click="uploadSvg">{{ t('common.upload') }}</button>
+                <label for="edit_dialog-extra-upload_walls">
+                    {{ t("game.ui.selection.edit_dialog.extra.upload_walls") }} (svg)
+                </label>
+                <button id="edit_dialog-extra-upload_walls" @click="uploadSvg">{{ t("common.upload") }}</button>
             </template>
             <template v-else>
-                <label for="edit_dialog-extra-upload_walls">{{ t('game.ui.selection.edit_dialog.extra.remove_walls') }} (svg)</label>
-                <button id="edit_dialog-extra-upload_walls" @click="removeSvg">{{ t('common.remove') }}</button>
+                <label for="edit_dialog-extra-upload_walls">
+                    {{ t("game.ui.selection.edit_dialog.extra.remove_walls") }} (svg)
+                </label>
+                <button id="edit_dialog-extra-upload_walls" @click="removeSvg">{{ t("common.remove") }}</button>
             </template>
             <template v-if="hasDDraftInfo">
-                <label for="edit_dialog-extra-upload_walls">{{ t('game.ui.selection.edit_dialog.extra.apply_draft_info') }}</label>
-                <button id="edit_dialog-extra-upload_walls" @click="applyDDraft">{{ t('common.apply') }}</button>
+                <label for="edit_dialog-extra-upload_walls">
+                    {{ t("game.ui.selection.edit_dialog.extra.apply_draft_info") }}
+                </label>
+                <button id="edit_dialog-extra-upload_walls" @click="applyDDraft">{{ t("common.apply") }}</button>
             </template>
         </template>
     </div>
diff --git a/client/src/game/ui/settings/shape/PropertySettings.vue b/client/src/game/ui/settings/shape/PropertySettings.vue
index bb85e5c68..2da48bde4 100644
--- a/client/src/game/ui/settings/shape/PropertySettings.vue
+++ b/client/src/game/ui/settings/shape/PropertySettings.vue
@@ -119,7 +119,7 @@ async function changeAsset(): Promise<void> {
     if (!owned.value) return;
     if (activeShapeStore.state.id === undefined) return;
     const data = await modals.assetPicker();
-    if (data === undefined || data.fileHash === undefined) return;
+    if (data === undefined || data.fileHash === null) return;
     const shape = getShape(activeShapeStore.state.id);
     if (shape === undefined || shape.type !== "assetrect") return;
     (shape as Asset).setImage(getImageSrcFromHash(data.fileHash, { addBaseUrl: false }), true);
diff --git a/client/src/game/ui/settings/shape/VariantSwitcher.vue b/client/src/game/ui/settings/shape/VariantSwitcher.vue
index b29d41dee..b6b0b5ba0 100644
--- a/client/src/game/ui/settings/shape/VariantSwitcher.vue
+++ b/client/src/game/ui/settings/shape/VariantSwitcher.vue
@@ -63,7 +63,7 @@ async function addVariant(): Promise<void> {
 
     const shape = getShape(vState.id!)!;
 
-    if (asset.fileHash === undefined) {
+    if (asset.fileHash === null) {
         console.error("Missing fileHash for new variant");
         return;
     }
diff --git a/server/generate_types.sh b/server/generate_types.sh
index 87b092edf..81378d501 100644
--- a/server/generate_types.sh
+++ b/server/generate_types.sh
@@ -14,7 +14,7 @@ sed -i 's/"VisionBlock"/VisionBlock/g' ../client/src/apiTypes.ts
 sed -i 's/"GridModeLabelFormat"/GridModeLabelFormat/g' ../client/src/apiTypes.ts
 sed -i '1s/^/'\
 'import type { AssetId } from ".\/assets\/models";\n'\
-'import type { GlobalId } from ".\/game\/id";\n'\
+'import type { GlobalId } from ".\/core\/id";\n'\
 'import type { LayerName } from ".\/game\/models\/floor";\n'\
 'import type { Role } from ".\/game\/models\/role";\n'\
 'import type { AuraId } from ".\/game\/systems\/auras\/models";\n'\
diff --git a/server/src/api/models/asset/__init__.py b/server/src/api/models/asset/__init__.py
index cb0798706..af79a74a1 100644
--- a/server/src/api/models/asset/__init__.py
+++ b/server/src/api/models/asset/__init__.py
@@ -19,11 +19,11 @@ class ApiAsset(TypeIdModel):
     # The name of the asset can be shown differently depending on sharing state
     name: str
     owner: str
-    fileHash: str | None
+    fileHash: str | None = Field(..., noneAsNull=True)
     # If specified, this provides the list of children for this asset
     # This should only be provided for folders (i.e. assets without a fileHash)
     # And is only provided in specific calls
-    children: list["ApiAsset"] | None
+    children: list["ApiAsset"] | None = Field(..., noneAsNull=True)
     shares: list[ApiAssetShare]  # Info on users that this specific asset is shared with