diff --git a/app/Traits/Recurring.php b/app/Traits/Recurring.php
index 3b4b6594f..ac693787a 100644
--- a/app/Traits/Recurring.php
+++ b/app/Traits/Recurring.php
@@ -39,13 +39,15 @@ trait Recurring
         $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
         $started_at = $request->get('paid_at') ?: ($request->get('invoiced_at') ?: $request->get('billed_at'));
 
-        if ($this->has('recurring')->count()) {
+        $recurring = $this->recurring();
+
+        if ($recurring->count()) {
             $function = 'update';
         } else {
             $function = 'create';
         }
 
-        $this->recurring()->$function([
+        $recurring->$function([
             'company_id' => session('company_id'),
             'frequency' => $frequency,
             'interval' => $interval,
diff --git a/public/css/app.css b/public/css/app.css
index 2bbb850af..841126099 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -585,3 +585,8 @@ input[type="number"] {
 .form-small #currency {
     width: 10%;
 }
+
+.input-group-recurring {
+    padding-left: 0;
+    padding-right: 0;
+}
diff --git a/resources/views/partials/form/recurring.blade.php b/resources/views/partials/form/recurring.blade.php
index 3ed0607b4..ba37d81e3 100644
--- a/resources/views/partials/form/recurring.blade.php
+++ b/resources/views/partials/form/recurring.blade.php
@@ -1,5 +1,5 @@
 @php
-    if (($page == 'create') || ($model->has('recurring')->count() > 0)) {
+    if (($page == 'create') || !$model->recurring()->count()) {
         $frequency = 'no';
         $interval = 1;
         $custom_frequency = 'monthly';
@@ -13,7 +13,7 @@
     }
 @endphp
 
-<div class="col-md-6 input-group-recurring" style="padding-left: 0; padding-right: 0;">
+<div class="col-md-6 input-group-recurring">
     <div class="form-group col-md-12 {{ $errors->has('recurring_frequency') ? 'has-error' : ''}}">
         {!! Form::label('recurring_frequency', trans('recurring.recurring'), ['class' => 'control-label']) !!}
         <div class="input-group">