diff --git a/src/invidious.cr b/src/invidious.cr
index 96e5d348..d3ad18bd 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -112,22 +112,7 @@ OUTPUT = CONFIG.output.upcase == "STDOUT" ? STDOUT : File.open(CONFIG.output, mo
 LOGGER = Invidious::LogHandler.new(OUTPUT, CONFIG.log_level)
 
 # Check table integrity
-if CONFIG.check_tables
-  Invidious::Database.check_enum("privacy", PlaylistPrivacy)
-
-  Invidious::Database.check_table("channels", InvidiousChannel)
-  Invidious::Database.check_table("channel_videos", ChannelVideo)
-  Invidious::Database.check_table("playlists", InvidiousPlaylist)
-  Invidious::Database.check_table("playlist_videos", PlaylistVideo)
-  Invidious::Database.check_table("nonces", Nonce)
-  Invidious::Database.check_table("session_ids", SessionId)
-  Invidious::Database.check_table("users", User)
-  Invidious::Database.check_table("videos", Video)
-
-  if CONFIG.cache_annotations
-    Invidious::Database.check_table("annotations", Annotation)
-  end
-end
+Invidious::Database.check_integrity(CONFIG)
 
 # Start jobs
 
diff --git a/src/invidious/database/base.cr b/src/invidious/database/base.cr
index a6b38f1c..0fb1b6af 100644
--- a/src/invidious/database/base.cr
+++ b/src/invidious/database/base.cr
@@ -3,6 +3,32 @@ require "pg"
 module Invidious::Database
   extend self
 
+  # Checks table integrity
+  #
+  # Note: config is passed as a parameter to avoid complex
+  # dependencies between different parts of the software.
+  def check_integrity(cfg)
+    return if !cfg.check_tables
+    Invidious::Database.check_enum("privacy", PlaylistPrivacy)
+
+    Invidious::Database.check_table("channels", InvidiousChannel)
+    Invidious::Database.check_table("channel_videos", ChannelVideo)
+    Invidious::Database.check_table("playlists", InvidiousPlaylist)
+    Invidious::Database.check_table("playlist_videos", PlaylistVideo)
+    Invidious::Database.check_table("nonces", Nonce)
+    Invidious::Database.check_table("session_ids", SessionId)
+    Invidious::Database.check_table("users", User)
+    Invidious::Database.check_table("videos", Video)
+
+    if cfg.cache_annotations
+      Invidious::Database.check_table("annotations", Annotation)
+    end
+  end
+
+  #
+  # Table/enum integrity checks
+  #
+
   def check_enum(enum_name, struct_type = nil)
     return # TODO