diff --git a/sps.module b/sps.module
index 2de71ea..22ae208 100644
--- a/sps.module
+++ b/sps.module
@@ -261,8 +261,9 @@ function sps_entitycache_save_alter(&$entities){
  * changing the node controller on behalf of the node_load Reaction
  */
 function sps_entity_info_alter(&$entity_info) {
+  $supported_controllers = array('NodeController', 'BeanEntityAPIController', 'PanelsPaneController');
   foreach ($entity_info as $name => &$info) {
-    if (isset($info['revision table'])) {
+    if (isset($info['revision table']) && in_array($info['controller class'], $supported_controllers)) {
       $info['controller class base'] = '\Drupal\sps\EntityController\\' . $info['controller class'];
       $info['controller class base'] = $info['controller class'];
       $info['controller class'] = '\Drupal\sps\EntityController\EntityControllerWrapper';