diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index 57a31e2f9..bc3bbd9ab 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -74,10 +74,14 @@
 
                 {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.vat_id.after') !!}
 
+                @php
+                    $addresses = old('address1') ?? explode(PHP_EOL, '');
+                @endphp
+
                 <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
                     <label for="address1" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
 
-                    <input type="text" class="control" name="address1[]" value="{{ old('address1') }}" id="address1" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+                    <input type="text" class="control" name="address1[]" value="{{ $addresses[0] ?? '' }}" id="address1" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
 
                     <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index e76b80be9..5577dff9a 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -77,7 +77,7 @@
                 <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
                     <label for="address_0" class="required">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
 
-                    <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+                    <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ $addresses[0] ?? '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
 
                     <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
                 </div>
@@ -85,7 +85,7 @@
                 @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
                     <div class="control-group" style="margin-top: -25px;">
                         @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                            <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
+                            <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ $addresses[$i] ?? '' }}">
                         @endfor
                     </div>
                 @endif
diff --git a/tests/functional/Customer/CustomerCest.php b/tests/functional/Customer/CustomerCest.php
index a4165b24e..f2532b44f 100644
--- a/tests/functional/Customer/CustomerCest.php
+++ b/tests/functional/Customer/CustomerCest.php
@@ -56,7 +56,7 @@ class CustomerCest
             'first_name'   => $faker->firstName,
             'last_name'    => $faker->lastName,
             'vat_id'       => 'INVALIDVAT',
-            'address1[]'   => $faker->streetAddress,
+            'address1[]'   => $faker->streetName,
             'country'      => $faker->countryCode,
             'state'        => $faker->state,
             'city'         => $faker->city,