diff --git a/src/gui/dialogs/formdatabasecleanup.cpp b/src/gui/dialogs/formdatabasecleanup.cpp
index 1c0e8a045..e227a7811 100755
--- a/src/gui/dialogs/formdatabasecleanup.cpp
+++ b/src/gui/dialogs/formdatabasecleanup.cpp
@@ -99,7 +99,5 @@ void FormDatabaseCleanup::loadDatabaseInfo() {
 
   m_ui->m_txtFileSize->setText(tr("file: %1, data: %2").arg(file_size_str, data_size_str));
   m_ui->m_txtDatabaseType->setText(qApp->database()->humanDriverName(qApp->database()->activeDatabaseDriver()));
-  m_ui->m_checkShrink->setEnabled(qApp->database()->activeDatabaseDriver() == DatabaseFactory::SQLITE ||
-                                  qApp->database()->activeDatabaseDriver() == DatabaseFactory::SQLITE_MEMORY);
   m_ui->m_checkShrink->setChecked(m_ui->m_checkShrink->isEnabled());
 }
diff --git a/src/miscellaneous/databasefactory.cpp b/src/miscellaneous/databasefactory.cpp
index 47e9b0eed..ddb7aa9c9 100755
--- a/src/miscellaneous/databasefactory.cpp
+++ b/src/miscellaneous/databasefactory.cpp
@@ -693,7 +693,7 @@ bool DatabaseFactory::mysqlVacuumDatabase() {
   QSqlDatabase database = mysqlConnection(objectName());
   QSqlQuery query_vacuum(database);
 
-  return query_vacuum.exec(QSL("OPTIMIZE TABLE rssguard.feeds;")) && query_vacuum.exec(QSL("OPTIMIZE TABLE rssguard.messages;"));
+  return query_vacuum.exec(QSL("OPTIMIZE TABLE Feeds;")) && query_vacuum.exec(QSL("OPTIMIZE TABLE Messages;"));
 }
 
 QSqlDatabase DatabaseFactory::sqliteConnection(const QString& connection_name, DatabaseFactory::DesiredType desired_type) {