diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index 9f07beeb4..2da70b3ce 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -262,7 +262,7 @@ class TestExportImport(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
             self.assertEqual(Document.objects.get(id=self.d4.id).title, "wow_dec")
             self.assertEqual(GroupObjectPermission.objects.count(), 1)
             self.assertEqual(UserObjectPermission.objects.count(), 1)
-            self.assertEqual(Permission.objects.count(), 124)
+            self.assertEqual(Permission.objects.count(), 128)
             messages = check_sanity()
             # everything is alright after the test
             self.assertEqual(len(messages), 0)
@@ -702,7 +702,7 @@ class TestExportImport(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
         with paperless_environment():
             self.assertEqual(
                 len(list(filter(lambda e: e["model"] == "auth.permission", manifest))),
-                124,
+                128,
             )
             # add 1 more to db to show objects are not re-created by import
             Permission.objects.create(
@@ -710,7 +710,7 @@ class TestExportImport(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
                 codename="test_perm",
                 content_type_id=1,
             )
-            self.assertEqual(Permission.objects.count(), 125)
+            self.assertEqual(Permission.objects.count(), 129)
 
             # will cause an import error
             self.user.delete()
@@ -720,4 +720,4 @@ class TestExportImport(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
                 call_command("document_importer", "--no-progress-bar", self.target)
 
             self.assertEqual(ContentType.objects.count(), 32)
-            self.assertEqual(Permission.objects.count(), 128)
+            self.assertEqual(Permission.objects.count(), 129)
diff --git a/src/paperless_tesseract/setting_schema.py b/src/paperless_tesseract/setting_schema.py
index 23c88dd7f..850fa1215 100644
--- a/src/paperless_tesseract/setting_schema.py
+++ b/src/paperless_tesseract/setting_schema.py
@@ -26,7 +26,11 @@ class OcrSetting:
 
 def get_ocr_settings() -> OcrSetting:
     db_settings = OcrSettingModel.objects.all().first()
-    # assert db_settings is not None
+    # Workaround for a test where the migration hasn't run to create the single model
+    if db_settings is None:
+        OcrSettingModel.objects.create()
+        db_settings = OcrSettingModel.objects.all().first()
+    assert db_settings is not None
 
     user_args = None
     if db_settings is not None and db_settings.user_args:
@@ -35,41 +39,30 @@ def get_ocr_settings() -> OcrSetting:
         user_args = json.loads(settings.OCR_USER_ARGS)
 
     return OcrSetting(
-        pages=db_settings.pages if db_settings is not None else settings.OCR_PAGES,
+        pages=db_settings.pages or settings.OCR_PAGES,
         language=db_settings.language
         if db_settings is not None and db_settings.language is not None
         else settings.OCR_LANGUAGE,
-        output_type=db_settings.output_type
-        if db_settings is not None
-        else settings.OCR_OUTPUT_TYPE,
-        mode=db_settings.mode if db_settings is not None else settings.OCR_MODE,
+        output_type=db_settings.output_type or settings.OCR_OUTPUT_TYPE,
+        mode=db_settings.mode or settings.OCR_MODE,
         skip_archive_file=(
-            db_settings.skip_archive_file
-            if db_settings is not None
-            else settings.OCR_SKIP_ARCHIVE_FILE
+            db_settings.skip_archive_file or settings.OCR_SKIP_ARCHIVE_FILE
         ),
         image_dpi=db_settings.image_dpi
         if db_settings is not None
         else settings.OCR_IMAGE_DPI,
-        clean=db_settings.unpaper_clean
-        if db_settings is not None
-        else settings.OCR_CLEAN,
-        deskew=db_settings.deskew if db_settings is not None else settings.OCR_DESKEW,
-        rotate=db_settings.rotate_pages
-        if db_settings is not None
-        else settings.OCR_ROTATE_PAGES,
+        clean=db_settings.unpaper_clean or settings.OCR_CLEAN,
+        deskew=db_settings.deskew or settings.OCR_DESKEW,
+        rotate=db_settings.rotate_pages or settings.OCR_ROTATE_PAGES,
         rotate_threshold=(
-            db_settings.rotate_pages_threshold
-            if db_settings is not None
-            else settings.OCR_ROTATE_PAGES_THRESHOLD
+            db_settings.rotate_pages_threshold or settings.OCR_ROTATE_PAGES_THRESHOLD
         ),
         max_image_pixel=db_settings.max_image_pixels
         if db_settings is not None
         else settings.OCR_MAX_IMAGE_PIXELS,
         color_conversion_strategy=(
             db_settings.color_conversion_strategy
-            if db_settings is not None
-            else settings.OCR_COLOR_CONVERSION_STRATEGY
+            or settings.OCR_COLOR_CONVERSION_STRATEGY
         ),
         user_args=user_args,
     )