diff --git a/YJMPD-UWP/Model/ApiHandler.cs b/YJMPD-UWP/Model/ApiHandler.cs
index ac0eb7d..936bc1e 100644
--- a/YJMPD-UWP/Model/ApiHandler.cs
+++ b/YJMPD-UWP/Model/ApiHandler.cs
@@ -96,7 +96,8 @@ namespace YJMPD_UWP.Model
                     App.Game.StopMatch();
                     break;
                 case Command.StopGame:
-                    App.Game.StopGame();
+                    if(App.Game.Status != GameHandler.GameStatus.STOPPED)
+                        App.Game.StopGame();
                     break;
                 default:
                     //Do nothing
diff --git a/YJMPD-UWP/ViewModels/PhotoVM.cs b/YJMPD-UWP/ViewModels/PhotoVM.cs
index 96c7f12..2d122b3 100644
--- a/YJMPD-UWP/ViewModels/PhotoVM.cs
+++ b/YJMPD-UWP/ViewModels/PhotoVM.cs
@@ -27,7 +27,7 @@ namespace YJMPD_UWP.ViewModels
         {
             dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
             {
-                if (e.Status == Model.PhotoHandler.PhotoStatus.NOPHOTO)
+                if (e.Status == Model.PhotoHandler.PhotoStatus.NOPHOTO && App.Game.Status == Model.GameHandler.GameStatus.WAITING)
                     timer.Start();
                 else
                 {