diff --git a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
index 78cdd5c207..dc55e0eca1 100644
--- a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
+++ b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
@@ -48,17 +48,20 @@ trait Storage {
   def newMap: PersistentMap[ElementType, ElementType]
   def newVector: PersistentVector[ElementType]
   def newRef: PersistentRef[ElementType]
-  def newQueue: PersistentQueue[ElementType]
+  def newQueue: PersistentQueue[ElementType] = // only implemented for redis
+    throw new UnsupportedOperationException
 
   def getMap(id: String): PersistentMap[ElementType, ElementType]
   def getVector(id: String): PersistentVector[ElementType]
   def getRef(id: String): PersistentRef[ElementType]
-  def getQueue(id: String): PersistentQueue[ElementType]
+  def getQueue(id: String): PersistentQueue[ElementType] = // only implemented for redis
+    throw new UnsupportedOperationException
 
   def newMap(id: String): PersistentMap[ElementType, ElementType]
   def newVector(id: String): PersistentVector[ElementType]
   def newRef(id: String): PersistentRef[ElementType]
-  def newQueue(id: String): PersistentQueue[ElementType]
+  def newQueue(id: String): PersistentQueue[ElementType] = // only implemented for redis
+    throw new UnsupportedOperationException
 }
 
 
diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
index 886245d147..fffa0011e5 100644
--- a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
+++ b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
@@ -12,17 +12,17 @@ object RedisStorage extends Storage {
   def newMap: PersistentMap[ElementType, ElementType] = newMap(Uuid.newUuid.toString)
   def newVector: PersistentVector[ElementType] = newVector(Uuid.newUuid.toString)
   def newRef: PersistentRef[ElementType] = newRef(Uuid.newUuid.toString)
-  def newQueue: PersistentQueue[ElementType] = newQueue(Uuid.newUuid.toString)
+  override def newQueue: PersistentQueue[ElementType] = newQueue(Uuid.newUuid.toString)
 
   def getMap(id: String): PersistentMap[ElementType, ElementType] = newMap(id)
   def getVector(id: String): PersistentVector[ElementType] = newVector(id)
   def getRef(id: String): PersistentRef[ElementType] = newRef(id)
-  def getQueue(id: String): PersistentQueue[ElementType] = newQueue(id)
+  override def getQueue(id: String): PersistentQueue[ElementType] = newQueue(id)
 
   def newMap(id: String): PersistentMap[ElementType, ElementType] = new RedisPersistentMap(id)
   def newVector(id: String): PersistentVector[ElementType] = new RedisPersistentVector(id)
   def newRef(id: String): PersistentRef[ElementType] = new RedisPersistentRef(id)
-  def newQueue(id: String): PersistentQueue[ElementType] = new RedisPersistentQueue(id)
+  override def newQueue(id: String): PersistentQueue[ElementType] = new RedisPersistentQueue(id)
 }
 
 /**