diff --git a/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java b/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
index c2d7d5ca85badc152a301c5c113cf4a1b8268f69..d7a07ac1327d20eafe34c6e920b3a07fe73bd053 100644
--- a/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
+++ b/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
@@ -196,6 +196,9 @@ public class AudioContent extends PadContent implements Pauseable, Durationable,
 
 	@Override
 	public void unloadMedia() {
+		// First Stop the pad (if playing)
+		getPad().setStatus(PadStatus.STOP);
+
 		durationProperty.unbind();
 		positionProperty.unbind();
 
@@ -204,7 +207,7 @@ public class AudioContent extends PadContent implements Pauseable, Durationable,
 		if (audioHandler != null)
 			audioHandler.unloadMedia();
 
-		Platform.runLater(() ->
+		Platform.runLater(() -> // TODO Platform.runLater ?
 		{
 			if (getPad() != null) {
 				getPad().setStatus(PadStatus.EMPTY);
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java
index 1856b369ac7080c9be4548540b83ef07b5f5ec7e..65f08624ca734bdecaec52e42ab43a5c4d8fb773 100644
--- a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java
+++ b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java
@@ -44,8 +44,7 @@ public class ImageContent extends PadContent {
 	}
 
 	@Override
-	public void updateVolume() {
-	}
+	public void updateVolume() {}
 
 	@Override
 	public String getType() {
@@ -79,6 +78,9 @@ public class ImageContent extends PadContent {
 
 	@Override
 	public void unloadMedia() {
+		// First Stop the pad (if playing)
+		getPad().setStatus(PadStatus.STOP);
+
 		Platform.runLater(() ->
 		{
 			if (getPad() != null) {
@@ -130,7 +132,7 @@ public class ImageContent extends PadContent {
 			e.printStackTrace();
 		}
 	}
-	
+
 	@Override
 	public PadContent clone() throws CloneNotSupportedException {
 		ImageContent clone = (ImageContent) super.clone();
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java
index a113ea1b56cfab56d627ca3c3d59147f1e3be365..0d49f9f637e3abb231dfc96e339de3b89522856d 100644
--- a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java
+++ b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java
@@ -187,7 +187,7 @@ public class VideoContent extends PadContent implements Pauseable, Durationable
 						getPad().getController().getView().showBusyView(false);
 					}
 				});
-//				getPad().throwException(path, player.getError()); TODO Error Handling User
+				// getPad().throwException(path, player.getError()); TODO Error Handling User
 			});
 			player.setOnEndOfMedia(() ->
 			{
@@ -209,6 +209,9 @@ public class VideoContent extends PadContent implements Pauseable, Durationable
 
 	@Override
 	public void unloadMedia() {
+		// First Stop the pad (if playing)
+		getPad().setStatus(PadStatus.STOP);
+
 		durationProperty.unbind();
 		positionProperty.unbind();
 
@@ -269,7 +272,7 @@ public class VideoContent extends PadContent implements Pauseable, Durationable
 			e.printStackTrace();
 		}
 	}
-	
+
 	@Override
 	public PadContent clone() throws CloneNotSupportedException {
 		VideoContent clone = (VideoContent) super.clone();