diff --git a/canopen/objectdictionary/__init__.py b/canopen/objectdictionary/__init__.py
index 09fe6e03..3704fd78 100644
--- a/canopen/objectdictionary/__init__.py
+++ b/canopen/objectdictionary/__init__.py
@@ -429,6 +429,16 @@ def decode_raw(self, data: bytes) -> Union[int, float, str, bytes, bytearray]:
             # Strip any trailing NUL characters from C-based systems
             return data.decode("utf_16_le", errors="ignore").rstrip("\x00")
         elif self.data_type in self.STRUCT_TYPES:
+            size = self.STRUCT_TYPES[self.data_type].size
+            logger.warning(f"Decoding data {data!r} of type 0x%X at %s",
+                           self.data_type, pretty_index(self.index, self.subindex))
+            logger.warning(f"Size: {size} bytes, data length: {len(data)} bytes")
+            if len(data) > size:
+                logger.warning("Excessive data in %s. Data type 0x%X expects %s bytes, got %s",
+                               pretty_index(self.index, self.subindex), self.data_type,
+                               size, len(data))
+                # Truncate the data to the expected size
+                data = data[:size]
             try:
                 value, = self.STRUCT_TYPES[self.data_type].unpack(data)
                 return value
diff --git a/canopen/sdo/client.py b/canopen/sdo/client.py
index 6d92588e..0341f005 100644
--- a/canopen/sdo/client.py
+++ b/canopen/sdo/client.py
@@ -118,23 +118,7 @@ def upload(self, index: int, subindex: int) -> bytes:
             When node responds with an error.
         """
         with self.open(index, subindex, buffering=0) as fp:
-            response_size = fp.size
-            data = fp.read()
-
-        # If size is available through variable in OD, then use the smaller of the two sizes.
-        # Some devices send U32/I32 even if variable is smaller in OD
-        var = self.od.get_variable(index, subindex)
-        if var is not None:
-            # Found a matching variable in OD
-            # If this is a data type (string, domain etc) the size is
-            # unknown anyway so keep the data as is
-            if var.data_type not in objectdictionary.DATA_TYPES:
-                # Get the size in bytes for this variable
-                var_size = len(var) // 8
-                if response_size is None or var_size < response_size:
-                    # Truncate the data to specified size
-                    data = data[0:var_size]
-        return data
+            return fp.read()
 
     def download(
         self,
diff --git a/test/test_sdo.py b/test/test_sdo.py
index fea52b6a..085c76dd 100644
--- a/test/test_sdo.py
+++ b/test/test_sdo.py
@@ -104,7 +104,9 @@ def test_size_not_specified(self):
         ]
         # Make sure the size of the data is 1 byte
         data = self.network[2].sdo.upload(0x1400, 2)
-        self.assertEqual(data, b'\xfe')
+        self.assertEqual(data, b'\xfe\x00\x00\x00')
+        data = self.network[2].object_dictionary[0x1400][2].decode_raw(data)
+        self.assertEqual(data, 254)
         self.assertTrue(self.message_sent)
 
     def test_expedited_download(self):
@@ -814,7 +816,6 @@ def test_unknown_od_112(self):
 
     def test_unknown_datatype32(self):
         """Test an unknown datatype, but known OD, of 32 bits (4 bytes)."""
-        return  # FIXME: Disabled temporarily until datatype conditionals are fixed, see #436
         # Add fake entry 0x2100 to OD, using fake datatype 0xFF
         if 0x2100 not in self.node.object_dictionary:
             fake_var = ODVariable("Fake", 0x2100)
@@ -829,7 +830,6 @@ def test_unknown_datatype32(self):
 
     def test_unknown_datatype112(self):
         """Test an unknown datatype, but known OD, of 112 bits (14 bytes)."""
-        return  # FIXME: Disabled temporarily until datatype conditionals are fixed, see #436
         # Add fake entry 0x2100 to OD, using fake datatype 0xFF
         if 0x2100 not in self.node.object_dictionary:
             fake_var = ODVariable("Fake", 0x2100)