diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index fa428a718f..5c0b8aaae7 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -519,6 +519,8 @@ class DB(SchemaUpgrade):
                 'timestamp', 'pubdate', 'uuid', 'path', 'cover',
                 'last_modified'):
             metadata = self.field_metadata[col].copy()
+            if col == 'comments':
+                metadata['table'], metadata['column'] = 'comments', 'text'
             if not metadata['table']:
                 metadata['table'], metadata['column'] = 'books', ('has_cover'
                         if col == 'cover' else col)
diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py
index f8ed0b035e..231af23038 100644
--- a/src/calibre/library/field_metadata.py
+++ b/src/calibre/library/field_metadata.py
@@ -220,8 +220,8 @@ class FieldMetadata(dict):
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('comments',  {'table':'comments',
-                           'column':'text',
+            ('comments',  {'table':None,
+                           'column':None,
                            'datatype':'text',
                            'is_multiple':{},
                            'kind':'field',