diff --git a/application/controllers/SuggestController.php b/application/controllers/SuggestController.php
index d2bbc1bd..f4cb4051 100644
--- a/application/controllers/SuggestController.php
+++ b/application/controllers/SuggestController.php
@@ -192,7 +192,11 @@ class SuggestController extends ActionController
     protected function suggestCheckcommandnames()
     {
         $db = $this->db()->getDbAdapter();
-        $query = $db->select()->from('icinga_command', 'object_name')->order('object_name');
+        $query = $db->select()
+            ->from('icinga_command', 'object_name')
+            ->where('object_type != ?', 'template')
+            ->order('object_name');
+
         return $db->fetchCol($query);
     }
 
diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index d126b55b..62ee08b5 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -20,6 +20,7 @@ before switching to a new version.
 * FEATURE: Users equipped with related permissions can toggle "Show SQL" in the GUI
 * FEATURE: A Service Set can now be assigned to multiple hosts at once #1281
 * FEATURE: Commands can now be filtered by usage (#1480)
+* FIX: Don't suggest Command templates where Commands are required (#1414)
 
 ### CLI
 * FEATURE: Director Health Check Plugin (#1278)