diff --git a/AsbCloudWebApi/Controllers/AdminTelemetryController.cs b/AsbCloudWebApi/Controllers/AdminTelemetryController.cs
index 8f5eef80..d259f94f 100644
--- a/AsbCloudWebApi/Controllers/AdminTelemetryController.cs
+++ b/AsbCloudWebApi/Controllers/AdminTelemetryController.cs
@@ -63,7 +63,8 @@ namespace AsbCloudWebApi.Controllers
                 GeDate = gDate,
                 LeDate = lDate
             };
-            await telemetryEditorService.DeleteAsync(request, token);
+            if(gDate.HasValue || lDate.HasValue)
+                await telemetryEditorService.DeleteAsync(request, token);
             return Ok();
         }
     }