diff --git a/views/components/locationpicker.blade.php b/views/components/locationpicker.blade.php
index f8840b3d..36e5b678 100644
--- a/views/components/locationpicker.blade.php
+++ b/views/components/locationpicker.blade.php
@@ -8,10 +8,10 @@
 @php if(empty($hint)) { $hint = ''; } @endphp
 
 <div class="form-group"
-	data-next-input-selector="{{ $nextInputSelector }}"
+	@if(isset($nextInputSelector))data-next-input-selector="{{ $nextInputSelector }}" @endif
 	data-prefill-by-name="{{ $prefillByName }}"
 	data-prefill-by-id="{{ $prefillById }}">
-	<label for="location_id">{{ $__t('Location') }}&nbsp;&nbsp;<span id="{{ $hintId }}"
+	<label for="location_id">{{ $__t('Location') }}&nbsp;&nbsp;<span @if(!empty($hintId))id="{{ $hintId }}" @endif
 			class="small text-muted">{{ $hint }}</span></label>
 	<select class="form-control location-combobox"
 		id="location_id"