diff --git a/app/main/routes.py b/app/main/routes.py
index 144a3c0..5ca0715 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -64,7 +64,7 @@ def change_game_settings(game_name):
     form.old_name = game.name
 
     if request.method == 'GET':
-        form.state.default = game.state.value
+        form.state.default = game.get_state().value
         # pylint: disable=no-member
         form.process()
         form.game_name.data = game.name
diff --git a/app/templates/_game_player_info.html b/app/templates/_game_player_info.html
index 3843b12..17e994f 100644
--- a/app/templates/_game_player_info.html
+++ b/app/templates/_game_player_info.html
@@ -15,7 +15,7 @@
       </tr>
       <tr>
         <th>Game State</th>
-        <td>{{ game.state.name.title() }}</td>
+        <td>{{ game.get_state().name.title() }}</td>
       </tr>
       <tr>
         <th>Start Time</th>
diff --git a/app/templates/game_owner_dashboard.html b/app/templates/game_owner_dashboard.html
index 3fb9212..42247f1 100644
--- a/app/templates/game_owner_dashboard.html
+++ b/app/templates/game_owner_dashboard.html
@@ -21,7 +21,7 @@
 <br><br>
 <p><b>Start Time: </b>{% if game.start_time %}{{ moment(game.start_time).format('DD-MM-YYYY, HH:mm') }}{% else %}None{% endif %}</p>
 <p><b>End Time: </b>{% if game.end_time %}{{ moment(game.end_time).format('DD-MM-YYYY, HH:mm') }}{% else %}None{% endif %}</p>
-<p><b>State: </b>{{ game.state.name.title() }}</p>
+<p><b>State: </b>{{ game.get_state().name.title() }}</p>
 <h2>Players:</h2>
 <p><a href="{{ url_for('main.add_player', game_name = game.name) }}">Add player</a></p>
 <div class="table-responsive">
diff --git a/app/templates/index.html b/app/templates/index.html
index b76abf0..c962b3e 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -28,7 +28,7 @@
             {% for game in current_user.games %}
             <tr>
                 <td><a href="{{ url_for('main.game_dashboard', game_name = game.name) }}">{{ game.name }}</a></td>
-                <td>{{ game.state.name.title() }}</td>
+                <td>{{ game.get_state().name.title() }}</td>
                 <td>{{ game.start_time }}</td>
                 <td>{{ game.end_time }}</td>
                 <td>