diff --git a/mouvements/ajouter_entree.html b/mouvements/ajouter_entree.html
index fcbca28..52fe2a7 100644
--- a/mouvements/ajouter_entree.html
+++ b/mouvements/ajouter_entree.html
@@ -137,7 +137,9 @@
 			<dl>
 				{{:input type="select" name="category" label="Catégorie" default_empty="— Aucune —" options=$categories required=true}}
 				{{:input type="text" name="name" label="Désignation" required=true}}
-				{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
+				{{if $storage != null}}
+					{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
+				{{/if}}
 				{{:input type="textarea" name="remarques" label="Remarques" cols="40", rows="3" required=false}}
 			</dl>
 		</fieldset>
diff --git a/mouvements/dupliquer_mouvement.html b/mouvements/dupliquer_mouvement.html
index d4aa977..6d507ea 100644
--- a/mouvements/dupliquer_mouvement.html
+++ b/mouvements/dupliquer_mouvement.html
@@ -237,7 +237,9 @@
 				}}
 			{{/if}}
 			{{if $mvt_new.direction == "input"}}
-				{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
+				{{if $storage != null}}
+					{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
+				{{/if}}
 			{{/if}}
 			{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
 		</dl>
diff --git a/mouvements/entrees/repertorie.html b/mouvements/entrees/repertorie.html
index 4261c93..f366d36 100644
--- a/mouvements/entrees/repertorie.html
+++ b/mouvements/entrees/repertorie.html
@@ -106,8 +106,9 @@
 			{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
 			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
 			{{:input type="number" name="amount" label="Quantité" required=true min=1 default=1}}
-			{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
->>>>>>> depositaire
+				{{if $storage != null}}
+					{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
+				{{/if}}
 			{{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}}
 		</dl>
 	</fieldset>
diff --git a/mouvements/modifier_mouvement.html b/mouvements/modifier_mouvement.html
index 69109c4..eabce23 100644
--- a/mouvements/modifier_mouvement.html
+++ b/mouvements/modifier_mouvement.html
@@ -247,7 +247,9 @@
 				}}
 			{{/if}}
 			{{if $mvt_new.direction == "input"}}
-				{{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}}
+				{{if $storage != null}}
+					{{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}}
+				{{/if}}
 			{{/if}}
 			{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
 		</dl>
diff --git a/storage/index.html b/storage/index.html
index 1036326..5e42424 100644
--- a/storage/index.html
+++ b/storage/index.html
@@ -32,6 +32,8 @@
 			{{:linkbutton label="Supprimer" shape="delete" href="delete_storage.html?key=%s"|args:$key target="_dialog"}}
 		</td>
 	</tr>
+{{else}}
+	<p class="block alert">Aucun lieu de stockage.</p>
 {{/list}}
 
 {{:admin_footer}}