diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 8f7fdb9e2..35f0bb8c7 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -1214,7 +1214,7 @@ SELECT
   }
 
   // and now, let's create tag associations
-  if (isset($params['tag_ids']))
+  if (isset($params['tag_ids']) and !empty($params['tag_ids']))
   {
     set_tags(
       explode(',', $params['tag_ids']),