diff --git a/src/App/Models/RemoteType.php b/src/App/Models/RemoteType.php
index 16f7c14..f00499b 100644
--- a/src/App/Models/RemoteType.php
+++ b/src/App/Models/RemoteType.php
@@ -81,7 +81,7 @@ private function fetchData(?string $value = null, bool $search = false)
     public function getRemoteData(?string $identifierValue = null)
     {
         $cacheKey = 'remote_custom_field_' . $this->id;
-        if (config('asseco-custom-fields.should_cache_remote') && Cache::has($cacheKey)) {
+        if ((bool) $identifierValue && config('asseco-custom-fields.should_cache_remote') && Cache::has($cacheKey)) {
             return Cache::get($cacheKey);
         }