diff --git a/simple_history/admin.py b/simple_history/admin.py
index 2d4e89550..29ad44826 100644
--- a/simple_history/admin.py
+++ b/simple_history/admin.py
@@ -20,9 +20,6 @@
 
 
 class SimpleHistoryAdmin(admin.ModelAdmin):
-    object_history_template = "simple_history/object_history.html"
-    object_history_form_template = "simple_history/object_history_form.html"
-
     def get_urls(self):
         """Returns the additional urls used by the Reversion admin."""
         urls = super().get_urls()
@@ -94,7 +91,15 @@ def history_view(self, request, object_id, extra_context=None):
         context.update(extra_context or {})
         extra_kwargs = {}
         return self.render_history_view(
-            request, self.object_history_template, context, **extra_kwargs
+            request,
+            [
+                f"admin/{app_label}/{opts.model_name}/object_history.html",
+                "admin/%s/object_history.html" % app_label,
+                "admin/object_history.html",
+                "simple_history/object_history.html",
+            ],
+            context,
+            **extra_kwargs,
         )
 
     def history_view_title(self, obj):
@@ -208,7 +213,16 @@ def history_form_view(self, request, object_id, version_id, extra_context=None):
         context.update(extra_context or {})
         extra_kwargs = {}
         return self.render_history_view(
-            request, self.object_history_form_template, context, **extra_kwargs
+            request,
+            [
+                "admin/%s/%s/object_history_form.html"
+                % (original_opts.app_label, model_name),
+                "admin/%s/object_history_form.html" % original_opts.app_label,
+                "admin/object_history_form.html",
+                "simple_history/object_history_form.html",
+            ],
+            context,
+            **extra_kwargs,
         )
 
     def history_form_view_title(self, obj):
diff --git a/simple_history/tests/tests/test_admin.py b/simple_history/tests/tests/test_admin.py
index dc1309086..0ba8bd915 100644
--- a/simple_history/tests/tests/test_admin.py
+++ b/simple_history/tests/tests/test_admin.py
@@ -490,7 +490,7 @@ def test_history_form_view_without_getting_history(self):
             context["log_entries"] = ANY
 
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context
+            request, admin.default_object_history_form_template, context
         )
 
     def test_history_form_view_getting_history(self):
@@ -548,7 +548,7 @@ def test_history_form_view_getting_history(self):
             context["log_entries"] = ANY
 
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context
+            request, admin.default_object_history_form_template, context
         )
 
     def test_history_form_view_getting_history_with_setting_off(self):
@@ -606,7 +606,7 @@ def test_history_form_view_getting_history_with_setting_off(self):
             context["log_entries"] = ANY
 
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context
+            request, admin.default_object_history_form_template, context
         )
 
     def test_history_form_view_getting_history_abstract_external(self):
@@ -666,7 +666,7 @@ def test_history_form_view_getting_history_abstract_external(self):
             context["log_entries"] = ANY
 
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context
+            request, admin.default_object_history_form_template, context
         )
 
     def test_history_form_view_accepts_additional_context(self):
@@ -728,7 +728,7 @@ def test_history_form_view_accepts_additional_context(self):
             context["log_entries"] = ANY
 
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context
+            request, admin.default_object_history_form_template, context
         )
 
     def test_history_view__title_suggests_revert_by_default(self):