diff --git a/src/Worker/OptimizeTables.php b/src/Worker/OptimizeTables.php
index c1d7b8f6f1..9a49e42561 100644
--- a/src/Worker/OptimizeTables.php
+++ b/src/Worker/OptimizeTables.php
@@ -40,11 +40,34 @@ class OptimizeTables
 
 		Logger::info('Optimize start');
 
+		DBA::e("OPTIMIZE TABLE `apcontact`");
 		DBA::e("OPTIMIZE TABLE `cache`");
+		DBA::e("OPTIMIZE TABLE `contact`");
+		DBA::e("OPTIMIZE TABLE `contact-relation`");
+		DBA::e("OPTIMIZE TABLE `conversation`");
+		DBA::e("OPTIMIZE TABLE `diaspora-contact`");
+		DBA::e("OPTIMIZE TABLE `diaspora-interaction`");
+		DBA::e("OPTIMIZE TABLE `fcontact`");
+		DBA::e("OPTIMIZE TABLE `gserver`");
+		DBA::e("OPTIMIZE TABLE `gserver-tag`");
 		DBA::e("OPTIMIZE TABLE `locks`");
+		DBA::e("OPTIMIZE TABLE `inbox-status`");
+		DBA::e("OPTIMIZE TABLE `item-uri`");
+		DBA::e("OPTIMIZE TABLE `notification`");
+		DBA::e("OPTIMIZE TABLE `notify`");
 		DBA::e("OPTIMIZE TABLE `oembed`");
 		DBA::e("OPTIMIZE TABLE `parsed_url`");
 		DBA::e("OPTIMIZE TABLE `session`");
+		DBA::e("OPTIMIZE TABLE `photo`");
+		DBA::e("OPTIMIZE TABLE `post`");
+		DBA::e("OPTIMIZE TABLE `post-content`");
+		DBA::e("OPTIMIZE TABLE `post-delivery-data`");
+		DBA::e("OPTIMIZE TABLE `post-link`");
+		DBA::e("OPTIMIZE TABLE `post-thread`");
+		DBA::e("OPTIMIZE TABLE `post-thread-user`");
+		DBA::e("OPTIMIZE TABLE `post-user`");
+		DBA::e("OPTIMIZE TABLE `storage`");
+		DBA::e("OPTIMIZE TABLE `tag`");
 
 		Logger::info('Optimize end');