diff --git a/templates/battery/form.html.twig b/templates/battery/form.html.twig
index e7d4fa34..232b8a41 100644
--- a/templates/battery/form.html.twig
+++ b/templates/battery/form.html.twig
@@ -71,7 +71,7 @@
                                         <select class="form-control m-input" id="manufacturer" name="manufacturer">
                                             <option value=""></option>
                                             {% for manufacturer in bmfgs %}
-                                                <option value="{{ manufacturer.getID }}"{{ obj.getManufacturer and manufacturer.getID == obj.getManufacturer.getID ? ' selected' }}>{{ manufacturer.getName }}</option>
+                                                <option value="{{ manufacturer.getID }}"{{  manufacturer.getID == obj.getManufacturer.getID|default(0) ? ' selected' }}>{{ manufacturer.getName }}</option>
                                             {% endfor %}
                                         </select>
                                         <div class="form-control-feedback hide" data-field="manufacturer"></div>
@@ -83,7 +83,7 @@
 										<select class="form-control m-input" id="model" name="model">
 											<option value=""></option>
 											{% for model in models %}
-												<option value="{{ model.getID }}"{{ obj.getModel and obj.getModel.getID ? ' selected' }}>{{ model.getName }}</option>
+												<option value="{{ model.getID }}"{{ obj.getModel.getID|default(0) == model.getID ? ' selected' }}>{{ model.getName }}</option>
 											{% endfor %}
 										</select>
 										<div class="form-control-feedback hide" data-field="model"></div>
@@ -95,7 +95,7 @@
 										<select class="form-control m-input" id="size" name="size">
 											<option value=""></option>
 											{% for size in sizes %}
-												<option value="{{ size.getID }}"{{ obj.getSize and obj.getSize.getID ? ' selected' }}>{{ size.getName }}</option>
+												<option value="{{ size.getID }}"{{ obj.getSize.getID|default(0) == size.getID ? ' selected' }}>{{ size.getName }}</option>
 											{% endfor %}
 										</select>
 										<div class="form-control-feedback hide" data-field="size"></div>