diff --git a/change_level.py b/change_level.py
index 6f3ef108..51a850bc 100755
--- a/change_level.py
+++ b/change_level.py
@@ -29,7 +29,11 @@ if __name__ == '__main__':
     if not 0 <= int(level) <= 10:
         print "Error: app level must be between 0 and 10, it's '%s'" % level
         sys.exit(1)
-
-    app_list[app_id]["level"] = int(level)
+        
+    if app_list[app_id]["state"] == "working":
+        app_list[app_id]["level"] = int(level)
+    elif "level" in app_list[app_id]:
+        print "Warning: app '%s' is currently not marked as working, the level is removed" % app_id
+        del app_list[app_id]["level"]
 
     open(app_list_name, "w").write("\n".join(json.dumps(app_list, indent=4, sort_keys=True).split(" \n")) + "\n")