diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module
index 89aeca66f2fc73f72c39d33b4dd38f9a8241fd8f..10bae64b59728ca30b1e64fe8c1b983de1e719fb 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.module
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.module
@@ -503,7 +503,7 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) {
   _field_sql_storage_query_field_conditions($query, $select_query, $query->fieldConditions, $table_aliases, '_field_sql_storage_columnname');
 
   // Add field meta conditions.
-  _field_sql_storage_query_field_conditions($query, $select_query, $query->fieldMetaConditions, $table_aliases, function ($field_name, $column) { return $column; });
+  _field_sql_storage_query_field_conditions($query, $select_query, $query->fieldMetaConditions, $table_aliases, '_field_sql_storage_query_columnname');
 
   if (isset($query->deleted)) {
     $select_query->condition("$field_base_table.deleted", (int) $query->deleted);
@@ -614,6 +614,13 @@ function _field_sql_storage_query_field_conditions(EntityFieldQuery $query, Sele
   }
 }
 
+/**
+ * Field meta condition column callback.
+ */
+function _field_sql_storage_query_columnname($field_name, $column) {
+  return $column;
+}
+
 /**
  * Implements hook_field_storage_delete_revision().
  *