diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index cfce4d88c..e007ee94d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -32,7 +32,7 @@
       <label for="lastname">{{ $t('person.lastname') }}</label>
    </div>
 
-   <div v-if="queryItems.length > 0">
+   <div v-if="queryItems">
       <ul class="list-suggest add-items inline">
          <li v-for="(qi, i) in queryItems" :key="i" @click="addQueryItem('lastName', qi)">
             <span class="person-text">{{ qi }}</span>
@@ -51,7 +51,7 @@
       <label for="firstname">{{ $t('person.firstname') }}</label>
    </div>
 
-   <div v-if="queryItems.length > 0">
+   <div v-if="queryItems">
       <ul class="list-suggest add-items inline">
          <li v-for="(qi, i) in queryItems" :key="i" @click="addQueryItem('firstName', qi)">
             <span class="person-text">{{ qi }}</span>
@@ -221,7 +221,7 @@ export default {
          return this.person.altNames.map(a => a ? a.label : '');
       },
       queryItems() {
-         return this.query.split(' ');
+         return this.query ? this.query.split(' ') : null;
       }
    },
    mounted() {
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 34d5b4f2d..5dacee2c0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -61,7 +61,7 @@
          <input class="form-control form-control-lg" id="name" v-model="thirdparty.text" v-bind:placeholder="$t('thirdparty.name')" />
          <label for="name">{{ $t('thirdparty.name') }}</label>
       </div>
-      <div v-if="query.length > 0">
+      <div v-if="query">
          <ul class="list-suggest add-items inline">
             <li @click="addQuery(query)">
                <span class="person-text">{{ query }}</span>