diff --git a/packages/strapi-plugin-graphql/services/GraphQL.js b/packages/strapi-plugin-graphql/services/GraphQL.js
index c345637d1e..e240236ec9 100644
--- a/packages/strapi-plugin-graphql/services/GraphQL.js
+++ b/packages/strapi-plugin-graphql/services/GraphQL.js
@@ -172,6 +172,8 @@ module.exports = {
           type = 'Float';
           break;
         case 'date':
+        case 'datetime':
+        case 'timestamp':
           type = 'DateTime';
           break;
         case 'enumeration':