diff --git a/taxonomy_access.module b/taxonomy_access.module
index d482285..5a68168 100644
--- a/taxonomy_access.module
+++ b/taxonomy_access.module
@@ -418,13 +418,16 @@ function taxonomy_access_query_term_access_alter($query) {
  *   Follow up when any of the above issues are fixed.
  */
 function taxonomy_access_form_alter(&$form, &$form_state, $form_id) {
-  // Do not handle empty or fieldless forms.
+  // Do not handle empty or fieldless forms, nor non-entity forms.
   if (!is_array($form_state)) {
     return;
   }
   if (empty($form_state['field'])) {
     return;
   }
+  if (empty($form['#entity_type'])) {
+    return;
+  }
 
   $ac_fields = array();
   $o_fields = array();