diff --git a/src/regtech_user_fi_management/entities/listeners.py b/src/regtech_user_fi_management/entities/listeners.py
index 03dc6a2..ddae75f 100644
--- a/src/regtech_user_fi_management/entities/listeners.py
+++ b/src/regtech_user_fi_management/entities/listeners.py
@@ -61,7 +61,8 @@ def _insert_history(
             hist["changeset"] = changes
             types = [t.as_db_dict() for t in target.sbl_institution_types]
             connection.execute(fi_history.insert().values(hist))
-            connection.execute(mapping_history.insert().values(types))
+            if types:
+                connection.execute(mapping_history.insert().values(types))
 
     return _insert_history
 
diff --git a/tests/entities/test_listeners.py b/tests/entities/test_listeners.py
index fb8abe5..60aec26 100644
--- a/tests/entities/test_listeners.py
+++ b/tests/entities/test_listeners.py
@@ -1,3 +1,4 @@
+from copy import deepcopy
 import pytest
 from unittest.mock import Mock, call
 from pytest_mock import MockerFixture
@@ -66,6 +67,23 @@ def test_fi_history_listener(self, mocker: MockerFixture):
         self.fi_history.insert.assert_called_once()
         self.mapping_history.insert.assert_called_once()
 
+    def test_fi_history_listener_no_types(self, mocker: MockerFixture):
+        inspect_mock = mocker.patch("regtech_user_fi_management.entities.listeners.inspect")
+        attr_mock1: AttributeState = Mock(AttributeState)
+        attr_mock1.key = "name"
+        attr_mock2: AttributeState = Mock(AttributeState)
+        attr_mock2.key = "event_time"
+        state_mock: InstanceState = Mock(InstanceState)
+        state_mock.attrs = [attr_mock1, attr_mock2]
+        inspect_mock.return_value = state_mock
+        fi_listener = _setup_fi_history(self.fi_history, self.mapping_history)
+        no_types = deepcopy(self.target)
+        no_types.sbl_institution_types = []
+        fi_listener(self.mapper, self.connection, no_types)
+        inspect_mock.assert_called_once_with(no_types)
+        self.fi_history.insert.assert_called_once()
+        self.mapping_history.insert.assert_not_called()
+
     def _get_fi_inspect_mock(self):
         fi_attr_mock: AttributeState = Mock(AttributeState)
         fi_attr_mock.key = "sbl_institution_types"