diff --git a/Application/AppController.m b/Application/AppController.m
index 2f781769a..b2d54fb09 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -217,7 +217,9 @@ BOOL kAppControllerShuttingDown = NO;
 				[playbackController playEntryAtIndex:pe.index startPaused:(lastStatus == CogStatusPaused) andSeekTo:@(pe.currentPosition)];
 			} else {
 				pe.current = NO;
+				pe.stopAfter = NO;
 				pe.currentPosition = 0.0;
+				pe.countAdded = NO;
 				[playlistController commitPersistentStore];
 			}
 		}
diff --git a/DataModel.xcdatamodeld/DataModel.xcdatamodel/contents b/DataModel.xcdatamodeld/DataModel.xcdatamodel/contents
index 0ba1e36ce..5d003293b 100644
--- a/DataModel.xcdatamodeld/DataModel.xcdatamodel/contents
+++ b/DataModel.xcdatamodeld/DataModel.xcdatamodel/contents
@@ -23,6 +23,7 @@
         <attribute name="channelConfig" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="channels" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="codec" optional="YES" attributeType="String"/>
+        <attribute name="countAdded" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="cuesheet" optional="YES" attributeType="String"/>
         <attribute name="current" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="currentPosition" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
@@ -67,7 +68,7 @@
     <elements>
         <element name="AlbumArtwork" positionX="0" positionY="207" width="128" height="59"/>
         <element name="PlayCount" positionX="-18" positionY="171" width="128" height="134"/>
-        <element name="PlaylistEntry" positionX="-36" positionY="9" width="128" height="704"/>
+        <element name="PlaylistEntry" positionX="-36" positionY="9" width="128" height="719"/>
         <element name="SandboxToken" positionX="-18" positionY="171" width="128" height="59"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 68d7576e3..84cb48547 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -246,6 +246,9 @@ static void *playlistControllerContext = &playlistControllerContext;
 }
 
 - (void)updatePlayCountForTrack:(PlaylistEntry *)pe {
+	if(pe.countAdded) return;
+	pe.countAdded = YES;
+
 	PlayCount *pc = pe.playCountItem;
 
 	if(pc) {
@@ -1393,6 +1396,7 @@ static void *playlistControllerContext = &playlistControllerContext;
 		currentEntry.current = NO;
 		currentEntry.stopAfter = NO;
 		currentEntry.currentPosition = 0.0;
+		currentEntry.countAdded = NO;
 	}
 
 	if(pe) {