diff --git a/SOPE/GDLContentStore/GCSSpecialQueries.m b/SOPE/GDLContentStore/GCSSpecialQueries.m
index 167b38559..ca7709e03 100644
--- a/SOPE/GDLContentStore/GCSSpecialQueries.m
+++ b/SOPE/GDLContentStore/GCSSpecialQueries.m
@@ -218,7 +218,7 @@
        @" c_old_session VARCHAR(4096) NULL,"
        @" c_session_started INT4 NOT NULL,"
        @" c_refresh_token VARCHAR(4096) NULL,"
-       @" c_access_token_expires_in INT4 NOT NULL,"
+       @" c_access_token_expires_in INT4 NULL,"
        @" c_refresh_token_expires_in INT4 NULL)");
 
   return [NSString stringWithFormat: sqlFolderFormat, tableName];
@@ -379,7 +379,7 @@
        @" c_old_session VARCHAR(4096) NULL,"
        @" c_session_started INT4 NOT NULL,"
        @" c_refresh_token VARCHAR(4096) NULL,"
-       @" c_access_token_expires_in INT4 NOT NULL,"
+       @" c_access_token_expires_in INT4 NULL,"
        @" c_refresh_token_expires_in INT4 NULL)");
 
   return [NSString stringWithFormat: sqlFolderFormat, tableName];
@@ -540,7 +540,7 @@
        @" c_old_session VARCHAR2(4096) NULL,"
        @" c_session_started INTEGER NOT NULL,"
        @" c_refresh_token VARCHAR2(4096) NULL,"
-       @" c_access_token_expires_in INTEGER NOT NULL,"
+       @" c_access_token_expires_in INTEGER NULL,"
        @" c_refresh_token_expires_in INTEGER NULL)");
 
   return [NSString stringWithFormat: sqlFolderFormat, tableName];
diff --git a/Scripts/mysql-utf8mb4.sql b/Scripts/mysql-utf8mb4.sql
index 38dd90ecb..41a8824e5 100644
--- a/Scripts/mysql-utf8mb4.sql
+++ b/Scripts/mysql-utf8mb4.sql
@@ -170,7 +170,7 @@ CREATE TABLE sogo_opend_id (
 	c_old_session              varchar(4096) DEFAULT '',
 	c_session_started           int(11)       NOT NULL,
 	c_refresh_token             varchar(4096) DEFAULT '',
-	c_access_token_expires_in    int(11)       NOT NULL,
+	c_access_token_expires_in    int(11)       DEFAULT '',
 	c_refresh_token_expires_in  int(11)       DEFAULT NULL,
 	PRIMARY KEY (c_user_session)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;