diff --git a/CHANGELOG.md b/CHANGELOG.md
index 706299cd..6a3d7332 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Replace HTML tables with markdown tables in README files.
 - Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION` and `UPDATE_NOTIFICATION_MODULE` to Finnish translations.
 - Run `npm test` on Travis automatically
+- Show the splash screen image even when is reboot or halted.
 
 ### Added
 - Add loaded function to modules, providing an async callback.
diff --git a/splashscreen/MagicMirror.script b/splashscreen/MagicMirror.script
index 9b614389..6e2f5643 100644
--- a/splashscreen/MagicMirror.script
+++ b/splashscreen/MagicMirror.script
@@ -1,7 +1,15 @@
 screen_width = Window.GetWidth();
 screen_height = Window.GetHeight();
 
-theme_image = Image("splash.png");
+if (Plymouth.GetMode() != "shutdown")
+{
+	theme_image = Image("splash.png");
+}
+else
+{
+	theme_image = Image("splash_halt.png");
+}
+
 image_width = theme_image.GetWidth();
 image_height = theme_image.GetHeight();
 
@@ -30,11 +38,8 @@ else
 	image_y = (screen_height - image_height) / 2;
 }
 
-if (Plymouth.GetMode() != "shutdown")
-{
-	sprite = Sprite (resized_image);
-	sprite.SetPosition (image_x, image_y, -100);
-}
+sprite = Sprite (resized_image);
+sprite.SetPosition (image_x, image_y, -100);
 
 message_sprite = Sprite();
 message_sprite.SetPosition(screen_width * 0.1, screen_height * 0.9, 10000);
diff --git a/splashscreen/splash_halt.png b/splashscreen/splash_halt.png
new file mode 100644
index 00000000..dcf9d8be
Binary files /dev/null and b/splashscreen/splash_halt.png differ