diff --git a/directives/directions.js b/directives/directions.js
index <HASH>..<HASH> 100644
--- a/directives/directions.js
+++ b/directives/directions.js
@@ -55,6 +55,11 @@
         (validKeys.indexOf(key) === -1) && (delete request[key]);
       }
 
+      if(request.waypoints) {
+        // Check fo valid values
+        if(request.waypoints == "[]" || request.waypoints == "")  delete request.waypoints;
+      }
+
       if (request.origin && request.destination) {
         console.log('request', request);
         directionsService.route(request, function(response, status) {
Add a fix for a empty waypoint array, that break the complete ng-map