diff --git a/epicardium/modules/bhi.c b/epicardium/modules/bhi.c
index 66f8bb7ea42f4f679f9247c85b323d04ddf621f9..711d5fe7fcb9ed3fe64a6a848f25c66cfa3cf993 100644
--- a/epicardium/modules/bhi.c
+++ b/epicardium/modules/bhi.c
@@ -460,6 +460,11 @@ void vBhi160Task(void *pvParameters)
 	}
 
 	/* Remap axes to match card10 layout */
+	/* Due to a known issue (#133) the first call to
+	 * bhy_mapping_matrix_set might fail. */
+	bhy_mapping_matrix_set(
+		PHYSICAL_SENSOR_INDEX_ACC, bhi160_mapping_matrix
+	);
 	bhy_mapping_matrix_set(
 		PHYSICAL_SENSOR_INDEX_ACC, bhi160_mapping_matrix
 	);