diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js
index 115ee278..010d041f 100644
--- a/public/viewjs/choresoverview.js
+++ b/public/viewjs/choresoverview.js
@@ -156,6 +156,8 @@ $(document).on('click', '.track-chore-button', function(e)
 								$('#chore-' + choreId + '-next-execution-assigned-user').text(result.next_execution_assigned_user.display_name);
 							}
 
+							$('#chore-' + choreId + '-reschedule-icon').remove();
+
 							Grocy.FrontendHelpers.EndUiBusy();
 							toastr.success(__t('Tracked execution of chore %1$s on %2$s', choreName, trackedTime));
 							RefreshStatistics();
diff --git a/services/ChoresService.php b/services/ChoresService.php
index 8829f450..7f069cb6 100644
--- a/services/ChoresService.php
+++ b/services/ChoresService.php
@@ -205,6 +205,13 @@ class ChoresService extends BaseService
 			$this->getStockService()->ConsumeProduct($chore->product_id, $chore->product_amount, false, StockService::TRANSACTION_TYPE_CONSUME, 'default', null, null, $transactionId, true);
 		}
 
+		if (!empty($chore->rescheduled_date))
+		{
+			$chore->update([
+				'rescheduled_date' => null
+			]);
+		}
+
 		return $lastInsertId;
 	}
 
diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php
index d4711ce9..9a4fc9fb 100644
--- a/views/choresoverview.blade.php
+++ b/views/choresoverview.blade.php
@@ -219,7 +219,8 @@
 						<span>-</span>
 						@endif
 						@if($curentChoreEntry->is_rescheduled == 1)
-						<span class="text-muted"
+						<span id="chore-{{ $curentChoreEntry->chore_id }}-reschedule-icon"
+							class="text-muted"
 							data-toggle="tooltip"
 							title="{{ $__t('Rescheduled') }}">
 							<i class="far fa-clock"></i>